Merge pull request #74 from sergiocabral/translate-basic-branching-file

Atualização dos arquivos originais com o do livro em inglês (rebase master)

Author: sergiocabral

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

@@ -106,7 +106,7 @@ Fast-forward
 
 You'll notice the phrase "`fast-forward`" in that merge.
 Because the commit `C4` pointed to by the branch `hotfix` you merged in was directly ahead of the commit `C2` you're on, Git simply moves the pointer forward.
-To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together -- this is called a "`fast-forward.`"
+To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together -- this is called a ``fast-forward.''
 
 Your change is now in the snapshot of the commit pointed to by the `master` branch, and you can deploy the fix.
 
@@ -171,7 +171,10 @@ Instead of just moving the branch pointer forward, Git creates a new snapshot th
 This is referred to as a merge commit, and is special in that it has more than one parent.
 
 .A merge commit
-image::images/basic-merging-2.png[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 issue in your issue-tracking system, and delete the branch: