Skip to content

Commit

Permalink
reword one unclear sentence
Browse files Browse the repository at this point in the history
suggested by @HonkingGoose and @ben
  • Loading branch information
aollier committed Mar 29, 2019
1 parent 6b82548 commit b2f184b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/submodules.asc
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ CONFLICT (submodule): Merge conflict in DbConnector
Automatic merge failed; fix conflicts and then commit the result.
----

What it's suggesting that you do is to update the index like you had run `git add`, which clears the conflict, then commit.
The suggested command Git is providing will update the index as though you had run `git add` (which clears the conflict), then commit.
You probably shouldn't do this though.
You can just as easily go into the submodule directory, see what the difference is, fast-forward to this commit, test it properly, and then commit it.

Expand Down

0 comments on commit b2f184b

Please sign in to comment.