Thread:Talk:Git/Workflow/Release notes conflicts

There's been a little discussion on the problem of release notes in wikitech-l. For a newbie non-coder like me, release notes conflicts are quite a nightmare, but I heard more experience coders complaining about rebase failures as well: is this one of the reasons why our release notes are so lacking?

Should the docs say something about e.g. adding release notes only with last patchsets, or with follow-up commits, or in batches? I think I'll never submit multiple i18n commits at once each modifying the same section of the release notes; I'll either add the release notes later or wait for each commit to be merged before adding the next, hoping for things to be less painful.