Re: git and bzr
- From
Linus Torvalds <torvalds@osdl.org>
- Date
- Nov 28, 2006, 21:49 UTC
- Message-ID
- <Pine.LNX.4.64.0611281346490.4244@woody.osdl.org>
- In-Reply-To
- <456CA981.4010808@onlinehome.de>
On Tue, 28 Nov 2006, Nicholas Allen wrote:
> > and here's how it looked in git: > git status
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.