Thread:Talk:Git/Workflow/Release notes conflicts