Resolve trunk history #293
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
johnhooks
approved these changes
Apr 20, 2023
johnhooks
approved these changes
Apr 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What?
Nothing.
Why?
I would like to publish releases from the Trunk branch, however somewhere in the history of the project we've ended up with unrelated histories, which is preventing a PR from Develop into Trunk.
How?
There are a few different options to fix this, but for now I've gone with the least destructive option, which is to merge Trunk's commits into Develop (even though they don't actually add anything) with
--allow-unrelated-histories. Probably needs to not be squashed and merged in this case.Testing Instructions
Screenshots or screencast