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.

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

Run on github action on 'main' branch, not just 'master' #72

Closed
wants to merge 16 commits into from

Conversation

rbubley
Copy link
Contributor

@rbubley rbubley commented Jan 1, 2023

No description provided.

@@ -4,9 +4,9 @@
name: Build and Test
on:
push:
branches: ["master"]
branches: ["main", "master"]
Copy link
Owner

Choose a reason for hiding this comment

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

As we only have a main branch, couldn't master just be replaced with it, rather than adding main to this array?

@manzanotti
Copy link
Owner

As interesting as some of your previous commits on this branch are (seriously, I like the monitoring saving data, that's something I want to add to the Home Assistant plugin at some point), I'd rather not have the commits polluting the git history, even though you've reversed the commits.

I've created a PR with your change, and merged it in though, so thank you!

@manzanotti manzanotti closed this Sep 30, 2023
@rbubley
Copy link
Contributor Author

rbubley commented Sep 30, 2023

Point noted. I accident merged from the wrong branch.

GitHub's Squash and Merge, for PRs is a great boon for such messy pull requests, obviating the need to worry about this sort of thing, and keeping the commit history clean.

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.

None yet

2 participants