Thomas Ackermann wrote: > Describe the conflict resolution in terms of the > commands the user is supposed to use. [...] > --- 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. Hm. It's been too long since I was a novice, since I find the above clear already. To make the text clearer, I think it would be best to *add* an example instead of replacing it by one. Thanks, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html