Resolve Git conflicts with both sides in mind.
Recent revisions are kept. Restoring one creates a new revision.
