From: Thomas Rast <trast@student.ethz.ch>
Date: Wed, 26 Oct 2011 12:27:03 GMT
Subject: Re: git merge successfully however this is still issue from logical perspective
Message-ID: <201110261427.03585.trast@student.ethz.ch>
In-Reply-To: <CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com>

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.

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