Skip to content

Commit b2f184b

Browse files
committed
reword one unclear sentence
suggested by @HonkingGoose and @ben
1 parent 6b82548 commit b2f184b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/07-git-tools/sections/submodules.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ CONFLICT (submodule): Merge conflict in DbConnector
682682
Automatic merge failed; fix conflicts and then commit the result.
683683
----
684684

685-
What it's suggesting that you do is to update the index like you had run `git add`, which clears the conflict, then commit.
685+
The suggested command Git is providing will update the index as though you had run `git add` (which clears the conflict), then commit.
686686
You probably shouldn't do this though.
687687
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.
688688

0 commit comments

Comments
 (0)