|
| From: | Dmitry Gutov |
| Subject: | Re: Should we restore manually maintained ChangeLogs |
| Date: | Wed, 9 Mar 2016 20:39:17 +0200 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 |
On 03/09/2016 08:34 PM, Paul Eggert wrote:
On 03/09/2016 10:27 AM, Eli Zaretskii wrote:If you don't do merges, you won't ever see merge conflicts.I saw conflicts all the time when rebasing or applying patches. Perhaps these weren't "merge conflicts" in some technical sense, but they were just as much a hassle.
IIRC, git-merge-changelog is supposed to handle those cases, too.
| [Prev in Thread] | Current Thread | [Next in Thread] |