[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#29366: gitmerge to handle NEWS better
From: |
Glenn Morris |
Subject: |
bug#29366: gitmerge to handle NEWS better |
Date: |
Mon, 20 Nov 2017 13:16:41 -0500 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Package: emacs
Version: 25.3
Severity: wishlist
Hi,
Thanks for gitmerge.el, it's a great help.
It would be nice if it could handle NEWS better.
Currently etc/NEWS in the emacs-26 branch has been renamed to
etc/NEWS.26 in master. Running M-x gitmerge, this is not detected.
emacs-26:etc/NEWS changes are merged to master:etc/NEWS, resulting in a
merge conflict every time NEWS is touched in emacs-26.
Can gitmerge do something to help here?
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- bug#29366: gitmerge to handle NEWS better,
Glenn Morris <=