Transcript

3.
Overview
Creating branches
How git checkout can be used to select a branch
How git merge can integrate the history of independent
branches

4.
git branch
A branch represents an independent line of development
The git branch command lets you create, list, rename, and
delete branches

5.
git branch
Usage
git branch
• List all of the branches in your repository
git branch <branch>
• Create a new branch called <branch>
• This does not check out the new branch
git branch -d <branch>
• Delete the specified branch
• This is a “safe” operation in that Git prevents you from deleting the branch
if it has unmerged changes

6.
git branch
Usage
git branch -D <branch>
• Force delete the specified branch, even if it has unmerged changes. This is
the command to use if you want to permanently throw away all of the
commits associated with a particular line of development
git branch -m <branch>
• Rename the current branch to <branch>

7.
git branch
Discussion
In Git, branches are a part of your everyday development process.
When you want to add a new feature or fix a bug—no matter how
big or how small—you spawn a new branch to encapsulate your
changes. This makes sure that unstable code is never committed to
the main code base, and it gives you the chance to clean up your
feature’s history before merging it into the main branch.

8.
git branch
Discussion
For example, the diagram below visualizes a repository with two
isolated lines of development, one for a little feature, and one for a
longer-running feature. By developing them in branches, it’s not
only possible to work on both of them in parallel, but it also keeps
the main master branch free from questionable code.

9.
git branch
Discussion
Branch Tips
• The implementation behind Git branches is much more lightweight than
SVN’s model. Instead of copying files from directory to directory, Git
stores a branch as a reference to a commit. In this sense, a branch
represents the tip of a series of commits—it's not a container for commits.
The history for a branch is extrapolated through the commit relationships.
• This has a dramatic impact on Git's merging model. Whereas merges in
SVN are done on a file-basis, Git lets you work on the more abstract level
of commits. You can actually see merges in the project history as a joining
of two independent commit histories.

10.
git branch
Discussion
Branch Tips
• The implementation behind Git branches is much more lightweight than
SVN’s model. Instead of copying files from directory to directory, Git
stores a branch as a reference to a commit. In this sense, a branch
represents the tip of a series of commits—it's not a container for commits.
The history for a branch is extrapolated through the commit relationships.
• This has a dramatic impact on Git's merging model. Whereas merges in
SVN are done on a file-basis, Git lets you work on the more abstract level
of commits. You can actually see merges in the project history as a joining
of two independent commit histories.

11.
git checkout
The git checkout command lets you navigate between the
branches created by git branch
Checking out a branch updates the files in the working
directory to match the version stored in that branch, and it
tells Git to record all new commits on that branch. Think of it
as a way to select which line of development you’re working
on.

12.
git checkout
Usage
git checkout <existing-branch>
• Check out the specified branch, which should have already been created
with git branch. This makes <existing-branch> the current branch, and
updates the working directory to match.
git checkout -b <new-branch>
• Create and check out <new-branch>. The -b option is a convenience flag
that tells Git to run git branch <new-branch> before running git checkout
<new-branch>.

13.
git checkout
Usage
git checkout -b <new-branch> <existing-branch>
• Same as the above invocation, but base the new branch off of <existingbranch> instead of the current branch.

14.
git checkout
Discussion
git checkout works hand-in-hand with git branch. When you want
to start a new feature, you create a branch with git branch, then
check it out with git checkout. You can work on multiple features
in a single repository by switching between them with git checkout.

16.
git checkout
Discussion
Having a dedicated branch for each new feature is a dramatic shift
from the traditional SVN workflow. It makes it ridiculously easy to
try new experiments without the fear of destroying existing
functionality, and it makes it possible to work on many unrelated
features at the same time. In addition, branches also facilitate
several collaborative workflows.

17.
git checkout
Discussion
Detached HEADs
• The git checkout command simply updates the HEAD to point to either the
specified branch or commit. When it points to a branch, Git doesn't
complain, but when you check out a commit, it switches into a
“detached HEAD” state.

18.
git checkout
Discussion
Detached HEADs
• If you were to start developing a feature while in a detached HEAD state,
there would be no branch allowing you to get back to it. When you
inevitably check out another branch (e.g., to merge your feature in), there
would be no way to reference your feature:

19.
git merge
Merging is Git's way of putting a forked history back
together again.
The git merge command lets you take the independent lines
of development created by git branch and integrate them into
a single branch.

20.
git merge
Usage
git merge <branch>
• Merge the specified branch into the current branch. Git will determine the
merge algorithm automatically
git merge --no-ff <branch>
• Merge the specified branch into the current branch, but always generate a
merge commit (even if it was a fast-forward merge). This is useful for
documenting all merges that occur in your repository.

21.
git merge
Discussion
Git has several distinct algorithms to accomplish this: a fastforward merge or a 3-way merge.
A fast-forward merge can occur when there is a linear path from
the current branch tip to the target branch. Instead of “actually”
merging the branches, all Git has to do to integrate the histories is
move (i.e., “fast forward”) the current branch tip up to the target
branch tip.

22.
git merge
Discussion
For example, a fast forward merge of somefeature into master would look something like the following:

23.
git merge
Discussion
A fast-forward merge is not possible if the branches have diverged.
When there is not a linear path to the target branch, Git has no
choice but to combine them via a 3-way merge
3-way merges use a dedicated commit to tie together the two
histories. The nomenclature comes from the fact that Git uses
three commits to generate the merge commit: the two branch tips
and their common ancestor.

25.
git merge
Discussion
Resolving Conflicts
• If the two branches you're trying to merge both changed the same part of
the same file, Git won't be able to figure out which version to use. When
such a situation occurs, it stops right before the merge commit so that you
can resolve the conflicts manually.
• The great part of Git's merging process is that it uses the familiar
edit/stage/commit workflow to resolve merge conflicts. When you
encounter a merge conflict, running the git status command shows you
which files need to be resolved.

26.
git merge
Discussion
Resolving Conflicts
• For example, if both branches modified the same section of hello.py, you
would see something like the following:

27.
git merge
Discussion
Resolving Conflicts
• When you're ready to finish the merge, all you have to do is run git add on
the conflicted file(s) to tell Git they're resolved. Then, you run a normal git
commit to generate the merge commit.