interrupting a merge session
Mark A. Flacy
mflacy at verizon.net
Fri Jun 15 02:24:27 UTC 2007
On 2007.06.14 15:28, Leo Razoumov wrote:
>
> It would be great if mercurial keeps track of "files waiting to be
> merged".
> It would also help to provide a command like "hg resolve" so that a
> user could take files off and on the list. It is handy if certain
> files should be merged by someone else like a more experience
> developer, project lead, etc.
*Rubs chin*
Soooo, how was the person who created the changeset competent enough to
make the changes which are now causing the problems? Or is something
else going on?
--
Mark A. Flacy
More information about the Mercurial
mailing list