* git merge successfully however this is still issue from logical perspective
@ 2011-10-26 12:08 Lynn Lin
2011-10-26 12:27 ` Thomas Rast
0 siblings, 1 reply; 4+ messages in thread
From: Lynn Lin @ 2011-10-26 12:08 UTC (permalink / raw)
To: git
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)
Thanks
Lynn
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git merge successfully however this is still issue from logical perspective
2011-10-26 12:08 git merge successfully however this is still issue from logical perspective Lynn Lin
@ 2011-10-26 12:27 ` Thomas Rast
2011-10-26 12:29 ` Lynn Lin
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Rast @ 2011-10-26 12:27 UTC (permalink / raw)
To: Lynn Lin; +Cc: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: git merge successfully however this is still issue from logical perspective
2011-10-26 12:27 ` Thomas Rast
@ 2011-10-26 12:29 ` Lynn Lin
2011-10-26 12:39 ` Thomas Rast
0 siblings, 1 reply; 4+ messages in thread
From: Lynn Lin @ 2011-10-26 12:29 UTC (permalink / raw)
To: Thomas Rast; +Cc: git
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: git merge successfully however this is still issue from logical perspective
2011-10-26 12:29 ` Lynn Lin
@ 2011-10-26 12:39 ` Thomas Rast
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Rast @ 2011-10-26 12:39 UTC (permalink / raw)
To: Lynn Lin; +Cc: git
Lynn Lin wrote:
> 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 ?
Depends what you mean by "trust".
If you expected a merge to understand what the changes on each side
were about, and then patch the code accordingly, no it can't do
that.[*] You are in no way guaranteed that the result of a merge is
correct or even compiles even if both sides of the merge were.
But after all git-merge is just a tool doing a well-defined operation:
textually merging the changes from both sides. AFAIK it could so far
always be trusted with doing *that* correctly.
[*] darcs can go half of the way by having more expressive
"changesets", but this can also fail. I think the general problem is
AI-complete.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-26 12:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-26 12:08 git merge successfully however this is still issue from logical perspective Lynn Lin
2011-10-26 12:27 ` Thomas Rast
2011-10-26 12:29 ` Lynn Lin
2011-10-26 12:39 ` Thomas Rast
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).