Resolve Git conflicts from focused file excerpts.
Recent revisions are kept. Restoring one creates a new revision.