Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge master-only changes into v3_gui #38

Merged
merged 6 commits into from
Oct 9, 2020
Merged

Merge master-only changes into v3_gui #38

merged 6 commits into from
Oct 9, 2020

Conversation

toofishes
Copy link
Contributor

PR #30 was merged into master but hasn't made it's way into the v3_gui branch yet. In addition, there were a few dependency bumps made in commit 6fbc569, including jQuery, that have left v3_gui lagging behind.

If opening a PR like this isn't what you want, it would be great if you let me and others know what exactly the purpose of each branch her eis. I'm not sure if eventually v3_gui will be merged into master, or vice versa, but it isn't super clear to me right now.

dependabot bot and others added 6 commits July 16, 2020 11:37
@glynhudson
Copy link
Contributor

Thanks, I don't see a problem with this merge. I will double-check with @jeremypoulter

v3_gui is for the ESP32 WiFi V3.x and the master branch is for ESP8266 WiFi V2.x. There are some changes that are required between the two versions which means they cannot be merged.

I guess it would be better to make v3_gui the new master branch since this is the latest version under active development and then point the older ESP8266 WiF V2.x to a separate archived branch.

@toofishes
Copy link
Contributor Author

Appreciate the explanation!

I think part of my confusion comes from seeing a commit like 755e766 on the master branch. Since I based the optimize-assets branch there on v3_gui, that commit seemingly resulted in all differences in v3_gui up to and including that work, landing back in the master branch.

jeremypoulter
jeremypoulter approved these changes Oct 8, 2020
View reviewed changes
Copy link
Collaborator

@jeremypoulter jeremypoulter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, don't see a problem with this. @glynhudson yeah should probably make the v3 the new default branch (being all PC about it)

@glynhudson glynhudson merged commit 2116bab into v3_gui Oct 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeremypoulter jeremypoulter jeremypoulter approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@toofishes @glynhudson @jeremypoulter