pull-changes-resolve-conflicts

Bring branches together without silently losing work.

version control

Only the most recent Revisions are kept. Restoring one saves its content again as the newest.