Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> It seems you are thinking too git'ly

I'm speaking from experience.

> For emacs purposes, you are interested on knowing *who* broke the build
> and *when* he incorporated the faulty change into upstream's trunk.

It seems pretty useless if cannot find out which revision of a big merge
is to blame.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."