index e53ff4b4e7464079ac6e19f2bceafcb44044fb39..9c08efa53abc2797a7b7ca0e589d83b9a4387987 100644 (file)
* Resolve the conflicts. `git-diff` would report only the
conflicting paths because of the above 2. and 3.. Edit the
- working tree files into a desirable shape, `git-update-index`
+ working tree files into a desirable shape, `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.