Skip to content

Add Advanced Merging to Ch7 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 22, 2014
Merged

Add Advanced Merging to Ch7 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
338eb5d
initial rename
schacon Sep 19, 2014
7cc6e59
advanced merging section
schacon Sep 19, 2014
fc710d0
finish the merge section
schacon Sep 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions book/03-git-branching/sections/basic-branching-and-merging.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down Expand Up @@ -245,6 +246,7 @@ please contact us at email.support@github.com
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]
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions book/07-git-tools/1-git-tools.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand All @@ -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.
Loading