Thread:Talk:Git/Workflow/Release notes conflicts/reply

Merge conflicts shouldn't be a nightmare; at most they are a nuisance :-). I don't think that there should be "last patchsets" or follow-up commits: A commit should encompass one complete change, from code to tests to documentation, in every patchset.  If you have changes that depend on each other (apart from the release notes), they should be submitted as such.

For more advanced use cases, there are merge drivers for example for GNU-style Changelogs that could inspire a similar tool for MediaWiki release notes. But I don't know how that integrates with Gerrit/Jenkins and if merge conflicts in release notes are really that much of a burden to MediaWiki developers.