Conversation
Contributor
Author
|
Note: this might require a force push as rebasing develop into main previously completely changed the commit history. In the future using merge commits from develop -> main may be a way to avoid this, I'm not sure entirely. Rebase in git and in this repo seems to have some unintended side effects in certain situations. This is a balance between a clean history and an accurate but messy history IMO. |
Contributor
Author
|
I'm seeing this message: 
|
Contributor
|
Well, maybe I should not have brought up about rebasing in the first place! It's always a complete pain. As Adam said in a previous comment, let's just merge as is and continue on to avoid accidentally breaking anything |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR is for merging main from the v1.1.0 release into develop