Skip to content

Commit 64de8a1

Browse files
author
Dmitri Tikhonov
committed
Fix issue 627: drop incorrect knock on older VCS
1 parent 8192c4d commit 64de8a1

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ This is referred to as a merge commit, and is special in that it has more than o
173173
.A merge commit
174174
image::images/basic-merging-2.png[A merge commit.]
175175

176-
It's worth pointing out that Git determines the best common ancestor to use for its merge base; this is different than older tools like CVS or Subversion (before version 1.5), where the developer doing the merge had to figure out the best merge base for themselves.
177-
This makes merging a heck of a lot easier in Git than in these other systems.
178-
179176
Now that your work is merged in, you have no further need for the `iss53` branch.
180177
You can close the ticket in your ticket-tracking system, and delete the branch:
181178

0 commit comments

Comments
 (0)