Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHANGELOG conflicts are very annoying #536

Closed
LLFourn opened this issue Feb 2, 2022 · 2 comments · Fixed by #544
Closed

CHANGELOG conflicts are very annoying #536

LLFourn opened this issue Feb 2, 2022 · 2 comments · Fixed by #544
Assignees

Comments

@LLFourn
Copy link
Contributor

LLFourn commented Feb 2, 2022

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/

@evanlinjin
Copy link
Member

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

rubocop/rubocop#8697 (comment)

@notmandatory
Copy link
Member

notmandatory commented Jul 13, 2022

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 notmandatory moved this to Ready to Review in BDK Maintenance Aug 26, 2022
@notmandatory notmandatory moved this from Todo to In Progress in BDK PM Roadmap Aug 26, 2022
Repository owner moved this from Ready to Review to Done in BDK Maintenance Aug 31, 2022
Repository owner moved this from In Progress to Done in BDK PM Roadmap Aug 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Archived in project
Development

Successfully merging a pull request may close this issue.

4 participants