[PATCH] git-merge documentation: conflicting merge leaves higher stages in index
- From
Junio C Hamano <junkio@cox.net>
- Date
- Dec 2, 2005, 09:16 UTC
- Message-ID
- <7vlkz37tbd.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7v8xv39a8z.fsf@assigned-by-dhcp.cox.net>
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>
---
Documentation/git-merge.txt | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
e8be26e9282e346b01aa41fd7ab0b5f7bf7dcfc3
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c117404..0cac563 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -108,10 +108,12 @@ When there are conflicts, these things h 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
-- 0.99.9.GIT