From 3ace1fe34bbf24a62215d06614f9cf29a80def4a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 2 Dec 2005 01:05:35 -0800 Subject: [PATCH] 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 --- Documentation/git-merge.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c1174041e..0cac563d4 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -108,10 +108,12 @@ When there are conflicts, these things happen: 2. Cleanly merged paths are updated both in the index file and in your working tree. -3. For conflicting paths, the index file records the version - from `HEAD`. The working tree files have the result of - "merge" program; i.e. 3-way merge result with familiar - conflict markers `<<< === >>>`. +3. For conflicting paths, the index file records up to three + versions; stage1 stores the version from the common ancestor, + stage2 from `HEAD`, and stage3 from the remote branch (you + can inspect the stages with `git-ls-files -u`). The working + tree files have the result of "merge" program; i.e. 3-way + merge result with familiar conflict markers `<<< === >>>`. 4. No other changes are done. In particular, the local modifications you had before you started merge will stay the -- 2.26.2