Re: Need help for a hg push
Norbert Koch <viteno(a)xemacs.org> writes:
* Michael Sperber <sperber(a)deinprogramm.de>:
> > I'm getting confused. I'm pretty sure I've pulled and updated
> > everything before I made my changes, simply because I don't want - and
> > normally need - to merge. As Steve has already noted, I'm reacting on
> > input from the developers.
>
> You did, but Aidan did not. :-)
So, what's the way out of this?
"hg merge"
(Or rebase.)
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta