Re: [PATCH 07/13] Improve description in "How to merge"
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:58:30
Thomas Ackermann [off-list ref] writes:
quoted hunk
Describe the conflict resolution in terms of the commands the user is supposed to use. Signed-off-by: Thomas Ackermann <redacted> --- Documentation/user-manual.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index ccbddc7..0656191 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt@@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit the result. ------------------------------------------------- Conflict markers are left in the problematic files, and after -you resolve the conflicts manually, you can update the index -with the contents and run Git commit, as you normally would when -creating a new file. - +you have resolved the conflicts manually, you can `git add` the +new contents and do a `git commit` in the end.
This is a slight documentation regression, as there are cases your conflict resolution is a removal of the file, isn't it?
If you examine the resulting commit using gitk, you will see that it has two parents, one pointing to the top of the current branch, and one to the top of the other branch.