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

To clarify: they're a nightmare, and not a simple nuisance, because by the time someone with +2 arrives to approve the rebased change a new conflict is likely to arise, and so on unless you're wise enough to be on IRC and rebase if only if there's a willing +2'er available.