[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge conflicts
|
From: |
Stefan Kangas |
|
Subject: |
Re: Merge conflicts |
|
Date: |
Mon, 4 Oct 2021 17:26:49 +0200 |
Glenn Morris <rgm@gnu.org> writes:
> The emacs-28 branch is already accruing merge conflicts against master,
> which is a bit depressing. Please think about these things if you are
> changing the same file on both branches. Eg remember to write
> "do not merge to master" in the log when appropriate (ef6c43b896?).
Thank you for the reminder, and many thanks for doing these merges.