Thread:Talk:Git/Workflow/Release notes conflicts/reply (3)

It also gets interesting when backporting release notes to other branches (REL1_xx)...