This repository has been archived by the owner on Dec 18, 2024. It is now read-only.
Merge V0.4.1 back to master #700
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SebastianSchildt
approved these changes
Oct 31, 2023
|
@erikbosch Plain merge seems we have disabled 
Rebase or try the squash? |
|
@SebastianSchildt - I assume it is some form of branch protection. We can rebase or squash, th only drawback is that it not will be as visible that the release branch has been "merged" back compared to if we would have a real merge commit. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For this PR I suggest to merge with a merge commit