[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merge conflicts
|
From: |
Glenn Morris |
|
Subject: |
Merge conflicts |
|
Date: |
Mon, 04 Oct 2021 11:22:13 -0400 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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?).
Thanks!
- Merge conflicts,
Glenn Morris <=