non-graphical merge tool

[Steve Barnes]

On 16/05/14 03:49, Michael Mossey wrote:
>
>
>
> On Wed, May 14, 2014 at 11:10 PM, Dirk Heinrichs <dhs at recommind.com 
> <mailto:dhs at recommind.com>> wrote:
>
>     Am 15.05.2014 03:36, schrieb Michael Mossey:
>
>>     If he runs "hg merge" I don't want it to pop him into kdiff3 as
>>     he probably won't understand it.
>
>     Educating him is not an option?
>
> Theoretically it's an option but he not even a programmer to tell the 
> truth. He's paying me to help him and our time is probably better 
> spent working on other things, letting me handle merges.
>
> Mike
>
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
Mike,

Maybe you should consider a switch to using something like ReviewBoard 
<http://www.reviewboard.org/>in your work flow then his changes will get 
merged in by you and then there should never be any conflicts if he does 
run a hg merge.

Gadget/Steve


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140516/ebc2d57d/attachment-0002.html>