Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Fill in missing switch in watch #1805

Merged
merged 1 commit into from
May 13, 2018
Merged

Fill in missing switch in watch #1805

merged 1 commit into from
May 13, 2018

Conversation

rnystrom
Copy link
Member

No description provided.

@rnystrom rnystrom merged commit f7e85d4 into master May 13, 2018
@rnystrom rnystrom deleted the fixup branch May 13, 2018 03:28
@BasThomas
Copy link
Collaborator

🤔 could we merge master in before testing / merging maybe to prevent this in the future?

@BasThomas
Copy link
Collaborator

Ah wait, the merge commit was red. I guess that's enough of an indicator.

@rnystrom
Copy link
Member Author

Ya there might be a bug in GitHawk then because it was green and let me merge. Will have to keep an eye out.

Sent with GitHawk

@BasThomas
Copy link
Collaborator

That's right as the branch was not in sync with master. I think you can enable in Settings that a branch has to be in sync with master before merging. The merge commit itself did fail, so everything was as expected.

@rnystrom
Copy link
Member Author

Ah! Good to know

Sent with GitHawk

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.

2 participants