Home » Mailing list archives » git » 2006 » November » 28

Re: git and bzr

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Linus Torvalds <torvalds@...>
To: Nicholas Allen <nick.allen@...>
Cc: Jakub Narebski <jnareb@...>, <bazaar-ng@...>, <git@...>
Subject: Re: git and bzr
Date: Tuesday, November 28, 2006 - 5:49 pm

On Tue, 28 Nov 2006, Nicholas Allen wrote:

Ehh. It told you exactly what happened when you actually did the merge, 
didn't it?

Yeah, "git status" won't tell you _why_ it results in unmerged paths, but 
the merge will have told you.  You must have seen that, but decided to 
just ignore it and not post it, because it didn't support the conclusion 
you wanted to get, did it?

There are lots of reasons why "git status" may tell you that something 
isn't merged. The most common one by far being an actual data conflict, 
not a name conflict. The reason for why something conflicts is always told 
at merge-time.

		Linus
-
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: git and bzr, Jakub Narebski, (Tue Nov 28, 2:06 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 4:37 pm)
Re: git and bzr, Martin Langhoff, (Tue Nov 28, 5:40 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 5:26 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 5:49 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 6:00 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 6:25 pm)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 6:52 am)
Re: git and bzr, Linus Torvalds, (Wed Nov 29, 1:29 pm)
Re: git and bzr, Marko Macek, (Wed Nov 29, 2:54 pm)
Re: git and bzr, Andreas Ericsson, (Thu Nov 30, 8:25 am)
Re: git and bzr, Theodore Tso, (Thu Nov 30, 4:01 pm)
Re: git and bzr, Linus Torvalds, (Wed Nov 29, 4:45 pm)
Re: git and bzr, Carl Worth, (Wed Nov 29, 8:05 pm)
Re: git and bzr, Raimund Bauer, (Thu Nov 30, 2:59 am)
Re: git and bzr, Andreas Ericsson, (Thu Nov 30, 8:45 am)
Re: git and bzr, Johannes Schindelin, (Thu Nov 30, 6:19 am)
Re: git and bzr, Nguyen Thai Ngoc Duy, (Thu Nov 30, 7:25 am)
Re: git and bzr, Johannes Schindelin, (Thu Nov 30, 8:23 am)
Re: git and bzr, Nguyen Thai Ngoc Duy, (Thu Nov 30, 5:01 am)
Re: git and bzr, Alan Chandler, (Thu Nov 30, 5:30 am)
Re: git and bzr, Steven Grimm, (Thu Nov 30, 5:39 am)
Re: git and bzr, Alan Chandler, (Thu Nov 30, 4:31 am)
Re: git and bzr, Carl Worth, (Thu Nov 30, 3:17 am)
Re: git and bzr, Carl Worth, (Wed Nov 29, 8:08 pm)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 4:07 pm)
Re: git and bzr, Jakub Narebski, (Wed Nov 29, 4:49 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 6:46 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 6:41 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 6:48 pm)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 6:49 am)
Re: git and bzr, Jon Loeliger, (Wed Nov 29, 4:37 pm)
Re: git and bzr, Jakub Narebski, (Wed Nov 29, 7:01 am)
Re: git and bzr, Shawn Pearce, (Tue Nov 28, 5:53 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 6:13 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 3:11 pm)
Re: git and bzr, Andy Parkins, (Tue Nov 28, 3:40 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 2:58 pm)