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

git-merge documentation: more details about resolving conflicts

Browse source 
Signed-off-by: Dan Hensgen <dan@methodhead.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dan Hensgen 2008-08-21 23:32:00 -04:00 committed by Junio C Hamano
parent 9188ed8962
commit 34ad1afa71
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Documentation/git-merge.txt
View file

@ -126,13 +126,25 @@ After seeing a conflict, you can do two things:
up working tree changes made by 2. and 3.; 'git-reset --hard' can up working tree changes made by 2. and 3.; 'git-reset --hard' can
be used for this. be used for this.
* Resolve the conflicts. `git diff` would report only the * Resolve the conflicts. Git will mark the conflicts in
conflicting paths because of the above 2. and 3. the working tree. Edit the files into shape and
Edit the working tree files into a desirable shape 'git-add' to the index. 'git-commit' to seal the deal.
('git mergetool' can ease this task), 'git-add' or 'git-rm'
them, to make the index file contain what the merge result
should be, and run 'git-commit' to commit the result.
You can work through the conflict with a number of tools:
* Use a mergetool. 'git mergetool' to launch a graphical
mergetool which will work you through the merge.
* Look at the diffs. 'git diff' will show a three-way diff,
highlighting changes from both the HEAD and remote versions.
* Look at the diffs on their own. 'git log --merge -p <path>'
will show diffs first for the HEAD version and then the
remote version.
* Look at the originals. 'git show :1:filename' shows the
common ancestor, 'git show :2:filename' shows the HEAD
version and 'git show :3:filename' shows the remote version.
SEE ALSO SEE ALSO
-------- --------