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.

Sign up for GitHub

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

Jump to bottom

Resolve conflicts #41

Open
qwerty287 opened this issue Nov 9, 2023 · 4 comments
Open

Resolve conflicts #41

qwerty287 opened this issue Nov 9, 2023 · 4 comments
Labels
enhancement Enhance existing feature

Comments

@qwerty287
Copy link
Contributor

E.g. by force-push instead of a new PR.
@qwerty287 qwerty287 added the enhancement Enhance existing feature label Nov 9, 2023
@anbraten
Copy link
Member

anbraten commented Nov 9, 2023

Could this lead to problems in case a maintainer does manual changes to the changelog file etc? On the other hand, should we support manual changes at all 🤔

@qwerty287
Copy link
Contributor Author

qwerty287 commented Nov 9, 2023 •
edited
Loading

What happens to manual changes right now? I'd guess their just overwritten so it wouldn't change the behavior but I didn't check

@anbraten
Copy link
Member

anbraten commented Nov 9, 2023 •
edited
Loading

It merges the previous branch and then writes the new changelog file, so it will overwrite it anyways.

@qwerty287
Copy link
Contributor Author

Yes, so we can also do a rebase and force-push if there conflicts 🙃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement Enhance existing feature
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@anbraten @qwerty287