Merge pull request #83 from schacon/advanced-merging-ch7

Add Advanced Merging to Ch7

Author: schacon

book/03-git-branching/sections/basic-branching-and-merging.asc

@@ -182,6 +182,7 @@ You can close the ticket in your ticket-tracking system, and delete the branch:
 $ git branch -d iss53
 ----
 
+[[_basic_merge_conflicts]]
 ==== Basic Merge Conflicts
 
 (((merging, conflicts)))
@@ -245,6 +246,7 @@ please contact us at [email protected]
 This resolution has a little of each section, and the `<<<<<<<`, `=======`, and `>>>>>>>` lines have been completely removed.
 After you've resolved each of these sections in each conflicted file, run `git add` on each file to mark it as resolved.
 Staging the file marks it as resolved in Git.
+
 If you want to use a graphical tool to resolve these issues, you can run `git mergetool`, which fires up an appropriate visual merge tool and walks you through the conflicts:(((git commands, mergetool)))
 
 [source,shell]
@@ -268,6 +270,8 @@ If you want to use a merge tool other than the default (Git chose `opendiff` in
 Just type the name of the tool you'd rather use.
 In <<_git_tools>>, we'll discuss how you can change this default value for your environment (Git gave us a helpful hint).
 
+If you need more advanced tools for resolving tricky merge conflicts, we cover more on merging in <<_advanced_merging>>.
+
 After you exit the merge tool, Git asks you if the merge was successful.
 If you tell the script that it was, it stages the file to mark it as resolved for you.
 You can run `git status` again to verify that all conflicts have been resolved:

book/07-git-tools/1-git-tools.asc

@@ -19,7 +19,9 @@ include::sections/rewriting-history.asc[]
 
 include::sections/reset.asc[]
 
-include::sections/undoing-merges.asc[]
+include::sections/advanced-merging.asc[]
+
+include::sections/rerere.asc[]
 
 include::sections/debugging.asc[]
 
@@ -29,13 +31,11 @@ include::sections/bundling.asc[]
 
 include::sections/replace.asc[]
 
-include::sections/rerere.asc[]
-
 include::sections/credentials.asc[]
 
 === Summary
 
 You’ve seen a number of advanced tools that allow you to manipulate your commits and staging area more precisely.
 When you notice issues, you should be able to easily figure out what commit introduced them, when, and by whom.
-If you want to use subprojects in your project, you’ve learned a few ways to accommodate those needs.
+If you want to use subprojects in your project, you’ve learned how to accommodate those needs.
 At this point, you should be able to do most of the things in Git that you’ll need on the command line day to day and feel comfortable doing so.