From 64de8a1b1f4d5b7d3fac2a67cfb8b36f8dddacfd Mon Sep 17 00:00:00 2001 From: Dmitri Tikhonov Date: Tue, 5 Jun 2018 15:31:09 -0400 Subject: [PATCH] Fix issue 627: drop incorrect knock on older VCS --- book/03-git-branching/sections/basic-branching-and-merging.asc | 3 --- 1 file changed, 3 deletions(-) diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc index 23c06ff5e..6f0c13b1f 100644 --- a/book/03-git-branching/sections/basic-branching-and-merging.asc +++ b/book/03-git-branching/sections/basic-branching-and-merging.asc @@ -173,9 +173,6 @@ This is referred to as a merge commit, and is special in that it has more than o .A merge commit image::images/basic-merging-2.png[A merge commit.] -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. -This makes merging a heck of a lot easier in Git than in these other systems. - Now that your work is merged in, you have no further need for the `iss53` branch. You can close the ticket in your ticket-tracking system, and delete the branch: