index 0cac563d40f17361569923aebb51e454fd24f92e..4ce799b520b501b1ea6dddd5643bf3aec2aca344 100644 (file)
include::merge-strategies.txt[]
+If you tried a merge which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
HOW MERGE WORKS
---------------