Merge Behaving Differently on Different Computers, Losing Changes

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Jun 26 19:22:54 UTC 2015



On 06/26/2015 10:25 AM, Jensen, Aaron wrote:
> In what is probably completely obvious to everyone else, the problem was
> our merge tool, Beyond Compare 3. The other two developers were on an
> old version (3.1.11) and I was on the latest (3.3.13). Looks like there
> was a bug that caused Bad Merges. In hindsight, Duh. Of course it was
> the merge tool. I feel stupid.

I'm happy you figured it out.

I assume than upgrading them to the latest version made the bad merging 
dissapear ?

-- 
Pierre-Yves David



More information about the Mercurial mailing list