Re: EWW bugs should be fixed on emacs-25 branch

[John Wiegley]

>>>>> Eli Zaretskii <address@hidden> writes:

> Maybe so, but better be safe than sorry. Given the number of times I saw Git
> experts here make mistakes about what does and doesn't work, I will trust
> gitmerge.el and our experience more than I trust what we think we know about
> Git. Also, gitmerge.el should DTRT no matter which version of Git is
> installed (I hear that some systems still have Git 1.7.1 or something like
> that).

I suppose then that I would like to understand exactly what gitmerge.el is
adding to the picture. I've managed some pretty crazy merge scenarios as a
contractor, and it never required building custom merging tools before.

So we run the opposite risk of people "just using gitmerge.el", but not
understanding what is actually happening. If it works for you, that's great;
but if I properly understand what is being done, then I can find a workflow
that might suit me better.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2