{"thread":{"id":"28772","subject":"git merge successfully however this is still issue from logical perspective","startedAt":"2011-10-26T12:08:11Z","lastAt":"2011-10-26T12:39:10Z","messageCount":4,"participants":["Lynn Lin","Thomas Rast"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178315","messageId":"CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com","threadId":"28772","inReplyTo":null,"subject":"git merge successfully however this is still issue from logical perspective","fromName":"Lynn Lin","fromEmail":"lynn.xin.lin@gmail.com","sentAt":"2011-10-26T12:08:11Z","receivedAt":"2011-10-26T12:08:11Z","isPatch":false,"sender":{"key":"lynn.xin.lin@gmail.com","avatar":null},"body":"Hi all,\n   Do this case can happen? When I do merge from one branch to master\nbranch,merge successfully however from code logical perspective it\nfails and It cause code compile (our project is using C++ language)\n\n\nThanks\nLynn\n"},{"id":"178316","messageId":"201110261427.03585.trast@student.ethz.ch","threadId":"28772","inReplyTo":"CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com","subject":"Re: git merge successfully however this is still issue from logical perspective","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-10-26T12:27:03Z","receivedAt":"2011-10-26T12:27:03Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Lynn Lin wrote:\n> Hi all,\n>    Do this case can happen? When I do merge from one branch to master\n> branch,merge successfully however from code logical perspective it\n> fails and It cause code compile (our project is using C++ language)\n\nSure.  The easiest example is when one side of a merge renames foo()\nto bar(), while the other side introduces another call to foo() in an\nunrelated part of the code.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"178317","messageId":"CAPgpnMR6_pRxMSLcdS=M4Cfj=dqk6KTXr3VGhk3LrnPHyv2waA@mail.gmail.com","threadId":"28772","inReplyTo":"201110261427.03585.trast@student.ethz.ch","subject":"Re: git merge successfully however this is still issue from logical perspective","fromName":"Lynn Lin","fromEmail":"lynn.xin.lin@gmail.com","sentAt":"2011-10-26T12:29:25Z","receivedAt":"2011-10-26T12:29:25Z","isPatch":false,"sender":{"key":"lynn.xin.lin@gmail.com","avatar":null},"body":"On Wed, Oct 26, 2011 at 8:27 PM, Thomas Rast <trast@student.ethz.ch> wrote:\n> Lynn Lin wrote:\n>> Hi all,\n>>    Do this case can happen? When I do merge from one branch to master\n>> branch,merge successfully however from code logical perspective it\n>> fails and It cause code compile (our project is using C++ language)\n>\n> Sure.  The easiest example is when one side of a merge renames foo()\n> to bar(), while the other side introduces another call to foo() in an\n> unrelated part of the code.\nDoes this mean we shouldn't trust merge result  ?\n\n>\n> --\n> Thomas Rast\n> trast@{inf,student}.ethz.ch\n>\n"},{"id":"178318","messageId":"201110261439.10751.trast@student.ethz.ch","threadId":"28772","inReplyTo":"CAPgpnMR6_pRxMSLcdS=M4Cfj=dqk6KTXr3VGhk3LrnPHyv2waA@mail.gmail.com","subject":"Re: git merge successfully however this is still issue from logical perspective","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-10-26T12:39:10Z","receivedAt":"2011-10-26T12:39:10Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Lynn Lin wrote:\n> On Wed, Oct 26, 2011 at 8:27 PM, Thomas Rast <trast@student.ethz.ch> wrote:\n> > Lynn Lin wrote:\n> >> Hi all,\n> >>    Do this case can happen? When I do merge from one branch to master\n> >> branch,merge successfully however from code logical perspective it\n> >> fails and It cause code compile (our project is using C++ language)\n> >\n> > Sure.  The easiest example is when one side of a merge renames foo()\n> > to bar(), while the other side introduces another call to foo() in an\n> > unrelated part of the code.\n> Does this mean we shouldn't trust merge result  ?\n\nDepends what you mean by \"trust\".\n\nIf you expected a merge to understand what the changes on each side\nwere about, and then patch the code accordingly, no it can't do\nthat.[*] You are in no way guaranteed that the result of a merge is\ncorrect or even compiles even if both sides of the merge were.\n\nBut after all git-merge is just a tool doing a well-defined operation:\ntextually merging the changes from both sides.  AFAIK it could so far\nalways be trusted with doing *that* correctly.\n\n\n\n[*] darcs can go half of the way by having more expressive\n\"changesets\", but this can also fail.  I think the general problem is\nAI-complete.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}