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

Update CHANGELOG.md #82

Merged
merged 2 commits into from
Dec 5, 2021
Merged

Update CHANGELOG.md #82

merged 2 commits into from
Dec 5, 2021

Conversation

Lokathor
Copy link
Contributor

@madsmtm i think this PR does what you were trying to do in #81, if this looks right to you we can merge it. The other one had a bunch of other changes bundled into the diff that looked a little strange so I think git was confused somehow.

Copy link
Member

@madsmtm madsmtm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine, with #81 I was hoping to somehow get rid of the semver-trick branch while preserving history, but I guess that's not really possible :/

CHANGELOG.md Outdated Show resolved Hide resolved
@maroider
Copy link
Member

maroider commented Nov 29, 2021

Does #81 even have a commit where you remove the non-changelog bits?
Either way, we only use "squash and merge", so the git history would still be lost.

@madsmtm
Copy link
Member

madsmtm commented Nov 29, 2021

Does #81 even have a commit where you remove the non-changelog bits?

I would have done it with a standard merge commit, and when merging, I'd rip out the non-changelog bits

we only use "squash and merge", so the git history would still be lost.

Totally fair

@Lokathor Lokathor merged commit 3a257f3 into master Dec 5, 2021
@Lokathor Lokathor deleted the Lokathor-patch-1 branch December 5, 2021 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants