Mike Kupfer wrote:
Dan Price pointed out to me a week or two ago that merging conflicts is
less convenient under Mercurial than under Teamware, because once you
start merging, Mercurial wants you to finish.
For the sake of my reasoning, why do you want to quit in the middle and resume?
I can see why it should be dealt with better, and I can see why it would be
perhaps useful, but I've never intentionally stopped (and quit) mid-merge,
so I agree with Matt that these seems pretty rare (if possibly messy).
Are we looking at a common thing here, or something that's done rarely?
I'd really rather not make what I would consider the normal case worse, for
the sake of a corner.
-- Rich
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
