|
| From: | David Kastrup |
| Subject: | Re: Referring to revisions in the git future. |
| Date: | Wed, 29 Oct 2014 15:35:48 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Eli Zaretskii <address@hidden> writes: >> From: David Kastrup <address@hidden> >> Date: Wed, 29 Oct 2014 12:00:18 +0100 >> >> Each commit tends to come with its own manual conflict resolution >> for ChangeLog. > > Not if you have git-merge-changelog installed. If it were part of the official workflow, it would be part of Emacs or at least ELPA. -- David Kastrup
| [Prev in Thread] | Current Thread | [Next in Thread] |