Update 4.1.x with 4.x #2405
Closed
Update 4.1.x with 4.x #2405
Conversation
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
Update 4.x to 4.1.0 so that ReadTheDocs has the latest
Fix status DotStar writes: fixes DotStar issues on PyRulers
merge 4.1.x into 4.x
|
Why use a merge to do this? Shouldn't the branch point to the same commit if they are identical? |
|
They diverged with different commits, by accident. We could reset one to the other, but that rewrites history: e.g., https://stackoverflow.com/questions/36320517/making-two-branches-identical. This way, even if the commits are different, they are still mergeable. Ideally, we make future changes on 4.1.x and merge it to 4.x. So I don't think it's critical that they share the same commit at this point. |
|
I will close this because I'm preparing another PR anyway that will incorporate these changes along with some more real ones. |
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.
This finishes making 4.1.x and 4.x identical, after #2401 (merging the other way).