Re: Build failure in syntax.c
Alan Mackenzie writes:
> updated. Why you didn't notice this earlier, I can't
really say. :-)
Indeed, there was such a conflict. I was kind of waiting for the error
to sort itself out. :-)
Ah.:-) Unfortunately, that won't happen. All VCSes that I know of
insist that you straighten out conflicts, and report back to them when
they're fixed.
I'm getting to like Mercurial.
Glad to hear it!
BTW IIRC, one thing I found awkward about Mercurial is that if there
is a conflict that you fix by hand, you need to use "hg resolve" to
mark each such file as committable. Both git (for sure) and bzr
(IIRC) accept the "add" command for this purpose, but I don't think hg
does.
If you're the kind of person who effortlessly remembers this kind of
nitty-gritty detail, great! If not, don't bother trying to memorize
it, just ask here when you do eventually run into it. :-)
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta