8000 Update 4.1.x with 4.x by dhalbert · Pull Request #2405 · adafruit/circuitpython · GitHub
[go: up one dir, main page]

Skip to content

Update 4.1.x with 4.x #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Conversation

dhalbert
Copy link
Collaborator

This finishes making 4.1.x and 4.x identical, after #2401 (merging the other way).

dhalbert and others added 4 commits August 29, 2019 18:48
Update 4.x to 4.1.0 so that ReadTheDocs has the latest
Fix status DotStar writes: fixes DotStar issues on PyRulers
@dhalbert dhalbert requested a review from tannewt December 17, 2019 23:03
@tannewt
Copy link
Member
tannewt commented Dec 17, 2019

Why use a merge to do this? Shouldn't the branch point to the same commit if they are identical?

@dhalbert
Copy link
Collaborator Author

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.

@dhalbert
Copy link
Collaborator Author

I will close this because I'm preparing another PR anyway that will incorporate these changes along with some more real ones.

@dhalbert dhalbert closed this Dec 18, 2019
@dhalbert dhalbert deleted the update-4.1.x-with-4.x branch February 29, 2020 02:26
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.

2 participants
0