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

Multiple instances need to have their local master reset #1219

Closed
tripleee opened this issue Nov 10, 2017 · 2 comments
Closed

Multiple instances need to have their local master reset #1219

tripleee opened this issue Nov 10, 2017 · 2 comments

Comments

@tripleee
Copy link
Member

@tripleee tripleee commented Nov 10, 2017

We had an issue yesterday #1213 where branch protection was briefly enabled in Smoke Detector's Github repository. This caused git operations to fail because the instance was not allowed to push to master.

As the result of this, at least teward/Solar Flare and NobodyNada/Raspberry Pi have unmerged commits on their master branch.

The simple and straightforward fix is probably to delete the local master and start over. You will lose some unmerged commits but they never made it to production anyway. Maybe check if there is something which needs to be resubmitted separately before you zap the master.

At least these instances need to be fixed:

@quartata

This comment has been minimized.

Copy link
Member

@quartata quartata commented Nov 10, 2017

This is a good example of why we shouldn't mess with local master until after we push successfully.

@tripleee

This comment has been minimized.

Copy link
Member Author

@tripleee tripleee commented Nov 23, 2017

Calling this done now; there could be instances left which still need this but I think we have the situation pretty much handled (and if something is broken now, it could be something else, too).

@tripleee tripleee closed this Nov 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.