|
| From: | Paul Eggert |
| Subject: | Re: Should we restore manually maintained ChangeLogs |
| Date: | Wed, 9 Mar 2016 10:34:46 -0800 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
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.
| [Prev in Thread] | Current Thread | [Next in Thread] |