Resolve Git conflicts without losing your branch.
Recent revisions are kept. Restoring one creates a new revision.