Thomas Ackermann <th.ac...@arcor.de> writes: > Describe the conflict resolution in terms of the > commands the user is supposed to use. > > Signed-off-by: Thomas Ackermann <th.ac...@arcor.de> > --- > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html