bdk icon indicating copy to clipboard operation
bdk copied to clipboard
verified publisher icon bitcoindevkit

CHANGELOG conflicts are very annoying

Open LLFourn opened this issue 3 years ago • 2 comments

During development we constantly have PRs that are unable to be merged due to conflicts in the CHANGELOG. I don't know what the solution is but here is the first result on google: https://about.gitlab.com/blog/2018/07/03/solving-gitlabs-changelog-conflict-crisis/

LLFourn avatar Feb 02 '22 01:02 LLFourn

It seems that the link you provided is the solution that everyone is using.

https://github.com/rubocop/rubocop/issues/8697#issuecomment-690875556

evanlinjin avatar Jul 11 '22 09:07 evanlinjin

I also have a PR that I think is a good way to fix this issue, but I need to dust it off and get some more discussion on it. #544

notmandatory avatar Jul 13 '22 16:07 notmandatory