Lightlines
By cognitedata

pull-changes-resolve-conflicts

cognitedata1.9k installs

Bring branches together without silently losing work.

Recent revisions are kept. Restoring one creates a new revision.