Know what blocks your changes from merging.
Recent revisions are kept. Restoring one creates a new revision.