git-merge documentation: conflicting merge leaves higher stages in index
This hopefully concludes the latest updates that changes the behaviour of the merge on an unsuccessful automerge. Instead of collapsing the conflicted path in the index to show HEAD, we leave it unmerged, now that diff-files can compare working tree files with higher stages. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 2, 2005 at 01:05 UTC
3ace1fe34bbf24a62215d06614f9cf29a80def4a
1 file changed
+6
-4
Documentation/git-merge.txt
+6
-4
@@ -108,10 +108,12 @@ When there are conflicts, these things happen:
108
2. Cleanly merged paths are updated both in the index file and
109
in your working tree.
110
111
-3. For conflicting paths, the index file records the version
112
- from `HEAD`. The working tree files have the result of
113
- "merge" program; i.e. 3-way merge result with familiar
114
- conflict markers `<<< === >>>`.
111
+3. For conflicting paths, the index file records up to three
112
+ versions; stage1 stores the version from the common ancestor,
113
+ stage2 from `HEAD`, and stage3 from the remote branch (you
114
+ can inspect the stages with `git-ls-files -u`). The working
115
+ tree files have the result of "merge" program; i.e. 3-way
116
+ merge result with familiar conflict markers `<<< === >>>`.
117
118
4. No other changes are done. In particular, the local
119
modifications you had before you started merge will stay the