Question about internal:fail
Sune Foldager
cryo at cyanite.org
Thu Dec 1 12:52:38 UTC 2011
On 30-11-2011 18:47, Mike Meyer wrote:
> On Wed, 30 Nov 2011 10:11:22 +0100
> Sune Foldager<cryo at cyanite.org> wrote:
>>> Which points out where the problem really is: what mercurial
>>> considers a conflict isn't the same thing as what I consider a
>>> conflict, and mercurial provides no way to modify that.
>> Sure, for those rare cases where you want to discard foreign branches
>> (similar to git's -s ours), use the tricks described in this thread
>> by me and others.
>
> You are again presuming to speak for someone else. That's a bad habit,
> and you should stop it.
Hey this is approaching the "lol u mad?" level pretty fast, and I'm no
the only one contributing :p. Anyway, I guess I try to speak for the
common case when in doubt. I maintain that this is a rare need for
people in general.
> It'd be easier to fork mercurial.
Greg's on to something better in his replies :)
-Sune
More information about the Mercurial
mailing list