[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conflict tedium

From: Glenn Morris
Subject: Re: merge conflict tedium
Date: Thu, 10 Jan 2019 20:05:03 -0500
User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)

Paul Eggert wrote:

> I've made that mistake myself, and the simplest fix I thought of was
> to immediately merge the emacs-26 branch myself to master, making sure
> that I handle the mistake correctly during the merge.

I think that's the best solution.

None of this is a big deal! :)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]