basic Mercurial merge "conflicts" tool

[A. S. Budden]

On 4 February 2014 13:35, BOGGESS Rod CORE <Rod.Boggess at tenova.com> wrote:
> From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Pietro Moras
> I kindly ask suggestions about what's the best basic off-the-shelf Mercurial configuration for facing possible merge "conflicts".
>
> Reason is I'm not yet ready to face this matter in all its complexity. Thanks!
>  - P.M.
>
> I use TortoiseHg, and this may be slightly different from the command line. That said, most merges are done automatically. If Mercurial doesn't see a change within three lines of another, it simply shoves them together and calls it a merge. That has never been the wrong thing to do.

We use BeyondCompare with TortoiseHg and find it a fantastic
combination.  One thing that has concerned many people with it,
though, is that reviewing the output of an automatic merge uses
different panes to doing a manual merge and many people get confused
by this on a regular basis.  Given that most merges that can be done
automatically can also be done in a very easy way manually (in our
experience), we've reconfigured Mercurial such that the two buttons
("Mercurial Merge" and "Tool Merge") have subtly different meanings:
"Mercurial Automatic Merge", "BeyondCompare Manual Merge".  The
default setting does an automatic merge wherever possible.  The user
then (presumably with a vague idea of what the changes are) decides
whether he/she trusts Mercurial to do it automatically or wants to do
it manually.  With the default behaviour, BeyondCompare would often
auto-merge and
reviewing what it had done was more challenging than just doing it
manually in the first place.

To configure this set-up, use TortoiseHg settings to specify
"beyondcompare3-noauto" as the merge tool.

Al

-- 
http://www.cgtk.co.uk