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

Ui fix: refuse to choose merge when preference not set #184

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

g-raud
Copy link
Contributor

@g-raud g-raud commented Mar 23, 2018

This is to avoid a sure failure during the propagation as mentioned in #183.

The Mac UI has not been tested so please test if it compiles and works as expected by trying to choose merge in the UI.

I may add commits later to warn that the merge command is not provided (but still select merging because it is what happens by default).

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.

2 participants