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

Emergency bug #473

Merged
merged 5 commits into from
May 22, 2014
Merged

Emergency bug #473

merged 5 commits into from
May 22, 2014

Conversation

Salandora
Copy link
Contributor

Fixing the Emergency won't stop bug #448

@foosel
Copy link
Member

foosel commented May 22, 2014

In that specific case it might also be a good idea to apply the bugfix against master. Cherry-picking 59c859f should be enough for this. Could you do that? Still at work...

foosel added a commit that referenced this pull request May 22, 2014
Emergency Stop should not only trigger an event but also at least cancel the print

Closes #448
@foosel foosel merged commit 7bba1dc into OctoPrint:devel May 22, 2014
@Salandora
Copy link
Contributor Author

Jup no problem, I guess i have to modify the master branch and send a pull request right?

@Salandora Salandora deleted the EmergencyBug branch May 22, 2014 10:45
@foosel
Copy link
Member

foosel commented May 22, 2014

In principle yes, although by using git cherry-pick (see the documentation) it won't (usually ^^) produce merge conflicts when merging master to devel or vice versa. Still... four lines won't be a issue there, so I'll quickly click merge on the other one too. Thanks!

@MrBalonio
Copy link

Thank you for fixing this. I though I was going crazy.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants