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

Denon mc7000 changelog #4324

Merged
merged 1 commit into from Sep 27, 2021
Merged

Denon mc7000 changelog #4324

merged 1 commit into from Sep 27, 2021

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Sep 25, 2021

changelog entry for #4021

@ronso0
Copy link
Member Author

ronso0 commented Sep 25, 2021

I'm quite confused by 2.3 vs. 2.3.1 and need some clarification:
The mapping #4021 was targeted at 2.3, in the meantime the 2.3.1 branch was created, but I pressed merge so it went into 2.3
Now I read on Zulip that the idea is to have 2.3.1 for the release, then merge everything back to 2.3

How to proceed?

@Holzhaus
Copy link
Member

I also didn't understand the rationale for the separate 2.3.1 branch.

@ronso0
Copy link
Member Author

ronso0 commented Sep 26, 2021

@mixxxdj/developers How to proceed?
Pull 2.3 into 2.3.1, than merge it back to 2.3 after the release?

@Be-ing
Copy link
Contributor

Be-ing commented Sep 26, 2021

I also didn't understand the rationale for the separate 2.3.1 branch.

2.3.1 was supposed to be released but nobody made a release announcement. The point of cutting a 2.3.1 branch was to not merge anything else. This belongs in 2.3.2.

@Holzhaus
Copy link
Member

I also didn't understand the rationale for the separate 2.3.1 branch.

2.3.1 was supposed to be released but nobody made a release announcement. The point of cutting a 2.3.1 branch was to not merge anything else. This belongs in 2.3.2.

Wouldn't it suffice to just tag a commit with 2.3.1, regardless if something else was merged afterwards or not? I didn't understand the need for a new branch.

@ronso0 ronso0 changed the base branch from 2.3.1 to 2.3 September 26, 2021 21:53
@ronso0
Copy link
Member Author

ronso0 commented Sep 26, 2021

That was not communicated clear enough, obviously.
We should think about how to do that better in the future.

This belongs in 2.3.2

Re-targeted at 2.3, but strange that it showed a lot of unrelated commits when I did so first.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

That was not communicated clear enough, obviously.

This was discussed on Zulip. I don't understand how it could have been clearer.

@ronso0
Copy link
Member Author

ronso0 commented Sep 27, 2021

well, then I probably just missed it in between the discussion about notarization and other stuff.

Nevertheless, the mapping went to 2.3, like this PR will.
The last commit in 2.3.1 is still 11e12c1, so nothing to worry about.
Merge?

@Be-ing Be-ing merged commit 023482f into mixxxdj:2.3 Sep 27, 2021
@ronso0 ronso0 deleted the denonMC7000-changelog branch September 27, 2021 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants