Mastering Git by By Chris Belanger & Jawwad Ahmad

Author:By Chris Belanger & Jawwad Ahmad
Language: eng
Format: epub
Publisher: Ray Wenderlich

Key points

Merging combines work done on one branch with work done on another branch.

Git performs three-way merges to combine content.

Ours refers to the branch to which you want to pull changes into; theirs refers to the branch that has the changes you want to pull into ours.

git log <theirs> --not <ours> shows you what commits are on the branch you want to merge, that aren’t in your branch already.

git merge <theirs> merges the commits on the “theirs” branch into "our" branch.

Git automatically creates a merge commit message for you, and lets you edit it before continuing with the merge.

Download

Copyright Disclaimer:
This site does not store any files on its server. We only index and link to content provided by other sites. Please contact the content providers to delete copyright contents if any and email us, we'll remove relevant links or contents immediately.