Re: merge result

From: Andrew Ardill <andrew.ardill@gmail.com>
Date: Sep 9, 2011, 12:41 UTC
Message-ID: <CAH5451=BpiN9P8gjL5TYQO+NSH913oXo1-bmscMXyy8QhFg8KQ@mail.gmail.com>
In-Reply-To: <CAPgpnMRrSmVrXD__jxv3uNrek8up+scHp+_Kj8+=HX8tfweWzQ@mail.gmail.com>

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??

Regards,

Andrew Ardill

On 9 September 2011 20:54, Lynn Lin <lynn.xin.lin@gmail.com> wrote:

Show 22 quoted lines

> 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
>