Just unpulled last 3 patches
igloo at earth.li
Tue Sep 4 11:29:28 EDT 2007
On Tue, Sep 04, 2007 at 03:18:45PM +0100, Ben Lippmeier wrote:
> I just un-pulled the last 3 patches I submitted because one of them had
Hmm, you shouldn't be able push patches that have unresolved conflicts.
> Apparently we're keeping patches with conflicts out of the head to ward off
> potential problems with darcs.
That is true, but the occasional conflict should be harmless, so in my
opinion it would generally be better to let it be once it is done, as
unpulling can lead to other headaches.
More information about the Cvs-ghc