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

Merge 6.1.0 release into master #654

Merged
merged 3 commits into from
Jun 16, 2024
Merged

Merge 6.1.0 release into master #654

merged 3 commits into from
Jun 16, 2024

Conversation

arjantijms
Copy link
Contributor

According to #651

@pzygielo

This comment was marked as resolved.

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
@markt-asf
Copy link
Contributor

Not sure we really need to do this. I think renaming the 6.1.0 branch to 6.1.x and updating master to 6.2.0(-SNAPSHOT) would get us to where we need to be.

@arjantijms
Copy link
Contributor Author

Not sure we really need to do this.

It's partially common practice, but also the exact commit that made 6.1.0 a fact would not be in the 6.2.0 branch then, right? Not sure if that's an issue by itself.

But most (all?) projects do it like this.

@markt-asf
Copy link
Contributor

I guess I am -0 on this. I don;t really see the point but no objection. I'll rename the 6.1.0 branch to 6.0.x once you are done.

@arjantijms arjantijms merged commit 8130fc7 into master Jun 16, 2024
3 checks passed
@arjantijms
Copy link
Contributor Author

@markt-asf it is done

@markt-asf markt-asf deleted the 6.1.0 branch June 17, 2024 07:33
@markt-asf
Copy link
Contributor

Tx. Branch renamed. I'll update the master branch to 6.2.x shortly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants