Merge pull request #1420 from salewski/ads/clarify-try-merge-in-ch7-submodules

submodules.asc: clarify DbConnector/try-merge example

Author: ben

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

@@ -688,7 +688,7 @@ This is what you'll have to merge in and resolve.
 You can either just try the merge with the SHA-1 directly, or you can create a branch for it and then try to merge that in.
 We would suggest the latter, even if only to make a nicer merge commit message.
 
-So, we will go into our submodule directory, create a branch based on that second SHA-1 from `git diff` and manually merge.
+So, we will go into our submodule directory, create a branch named ``try-merge'' based on that second SHA-1 from `git diff`, and manually merge.
 
 [source,console]
 ----
@@ -698,7 +698,8 @@ $ git rev-parse HEAD
 eb41d764bccf88be77aced643c13a7fa86714135
 
 $ git branch try-merge c771610
-(DbConnector) $ git merge try-merge
+
+$ git merge try-merge
 Auto-merging src/main.c
 CONFLICT (content): Merge conflict in src/main.c
 Recorded preimage for 'src/main.c'