You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The easiest way to integrate the branches, as we've already covered, is the `merge` command.
16
16
It performs a three-way merge between the two latest branch snapshots (`C3` and `C4`) and the most recent common ancestor of the two (`C2`), creating a new snapshot (and commit).
17
17
18
+
[[rebasing-merging-example]]
18
19
.Merging to integrate diverged work history
19
20
image::images/basic-rebase-2.png[Merging to integrate diverged work history.]
20
21
@@ -48,7 +49,7 @@ $ git merge experiment
48
49
.Fast-forwarding the master branch
49
50
image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
50
51
51
-
Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in the merge example.
52
+
Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in <<rebasing-merging-example,the merge example>>.
52
53
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
53
54
If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.
0 commit comments