merge result

Lynn Lin <lynn.xin.lin@xxxxxxxxx> · Fri, 9 Sep 2011 18:54:21 +0800

Hi All,
   When I merge branch A back to master branch,if there are same
commit(developer do double commit) both in master and A branch, there
will be two same commit in master branch.For example

   1->2->3-4>5        Master
       |
       4->6->7          A

When I merge A branch into master,the two same 4 commit will present
in master branch.

Is there any wrong with my operation?

Thanks for your help
Lynn
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html