From: Lynn Lin Date: Sat, 10 Sep 2011 01:07:35 GMT Subject: Re: merge result Message-ID: In-Reply-To: On Fri, Sep 9, 2011 at 8:41 PM, Andrew Ardill wrote: > Hi Lynn, > > If you merge two branches together you are merging the state of the > head of those trees, not re-applying commits on top of each other. The > changes introduced in commit 4 will therefore not be applied twice, > but will more-or-less be ignored. > > Perhaps you are not trying a merge operation, but something else? Is > this issue hypothetical, or is it something you have experienced?? 1$ git checkout master 2$ git edit and commit 3$ git checkout branchA 4$ git edit and commit 5$ git checkout master 6 $ git merge branchA 2 and 4 change is the same > Regards, > > Andrew Ardill > > > > On 9 September 2011 20:54, Lynn Lin wrote: >> 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@vger.kernel.org >> More majordomo info at  http://vger.kernel.org/majordomo-info.html >> >