On Tue, May 7, 2013 at 3:07 PM, Bartosz Dziewoński matma.rex@gmail.com wrote:
On Tue, 07 May 2013 21:00:05 +0200, Chad innocentkiller@gmail.com wrote:
The current process for release notes is fine; we just need someone to write a custom merge driver for JGit to avoid the merge conflicts. This is a technical issue, not a policy one.
As I said many times before, this isn't really necessary since JGit now supports recursive merges, it's just experimental so I hadn't turned it on.
How catastrophic could turning it on be? Because if not very much, then this would greatly improve everyone's workflows. Just count the manual rebase patchsets on anything involving release notes...
I haven't tried, so who knows. We could turn it on for a test repo (it's configured like normal merge strategies, just no UI for it) and give it a whirl.
-Chad