Skip to content

Conversation

@vaind
Copy link
Collaborator

@vaind vaind commented Nov 14, 2022

This is a tagged release but not merged to the main branch - can anyone merge it without squashing (otherwise the release commit would say it doesn't exist in the repo?

#skip-changelog

@vaind vaind changed the title release: 6.7.0 merge "release: 6.7.0" to main Nov 14, 2022
@romtsn
Copy link
Member

romtsn commented Nov 14, 2022

Sorry I didn't get, why do we need this? Isn't this already existing 78ede0b ?

@vaind
Copy link
Collaborator Author

vaind commented Nov 14, 2022

Sorry I didn't get, why do we need this? Isn't this already existing 78ede0b ?

that commit is not on the main branch, unlike normal releases that haven't failed at some point in the release process, e.g.
image

@romtsn romtsn enabled auto-merge November 14, 2022 12:50
@romtsn romtsn disabled auto-merge November 14, 2022 13:00
@romtsn romtsn changed the title merge "release: 6.7.0" to main release: 6.7.0 Nov 14, 2022
@romtsn
Copy link
Member

romtsn commented Nov 14, 2022

@vaind gotcha, I enabled regular merge with a new commit creation - is that what you need? I think you can also use it

@vaind vaind enabled auto-merge November 14, 2022 13:32
@vaind
Copy link
Collaborator Author

vaind commented Nov 14, 2022

@vaind gotcha, I enabled regular merge with a new commit creation - is that what you need? I think you can also use it

thanks, can you approve it too? I can't merge otherwise

@romtsn
Copy link
Member

romtsn commented Nov 14, 2022

I already approved, I guess it wants you to update the branch with latest main first?

@vaind vaind disabled auto-merge November 14, 2022 13:41
@vaind vaind merged commit be45a71 into main Nov 14, 2022
@vaind vaind deleted the release/6.7.0 branch November 14, 2022 14:03
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