index c65ca9a5300096d69d540657ffd963070f429874..3a7d385225754d5c865ac333a5a65e71c4e7fb65 100644 (file)
local `master` branch.
+If you tried a pull which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
SEE ALSO
--------
gitlink:git-fetch[1], gitlink:git-merge[1]