From: Lynn Lin <lynn.xin.lin@gmail.com>
Date: Wed, 26 Oct 2011 12:29:25 GMT
Subject: Re: git merge successfully however this is still issue from logical perspective
Message-ID: <CAPgpnMR6_pRxMSLcdS=M4Cfj=dqk6KTXr3VGhk3LrnPHyv2waA@mail.gmail.com>
In-Reply-To: <201110261427.03585.trast@student.ethz.ch>

On Wed, Oct 26, 2011 at 8:27 PM, Thomas Rast <trast@student.ethz.ch> wrote:
> Lynn Lin wrote:
>> Hi all,
>>    Do this case can happen? When I do merge from one branch to master
>> branch,merge successfully however from code logical perspective it
>> fails and It cause code compile (our project is using C++ language)
>
> Sure.  The easiest example is when one side of a merge renames foo()
> to bar(), while the other side introduces another call to foo() in an
> unrelated part of the code.
Does this mean we shouldn't trust merge result  ?

>
> --
> Thomas Rast
> trast@{inf,student}.ethz.ch
>