development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-merge documentation: conflicting merge leaves higher stages in index

Browse source 
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>
This commit is contained in:
Junio C Hamano 2005-12-02 01:05:35 -08:00
parent 54dd99a127
commit 3ace1fe34b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/git-merge.txt
View file

@ -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