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

Configuration option to disable merge conflict resolution #1305

Merged
merged 5 commits into from Feb 8, 2018

Conversation

Projects
None yet
2 participants
@smashwilson
Member

smashwilson commented Feb 7, 2018

Introduce a github.graphicalConflictResolution setting that can be set to false to disable in-editor conflict resolution.

Fixes #1078.

smashwilson added some commits Feb 7, 2018

@smashwilson smashwilson merged commit b05b1c3 into master Feb 8, 2018

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@smashwilson smashwilson deleted the disable-merge-conflict-resolution branch Feb 8, 2018

@santiago-elustondo

This comment has been minimized.

santiago-elustondo commented Apr 24, 2018

I have set this configuration in config.cson, but nothing has changed. What am I doing wrong?
screen shot 2018-04-24 at 2 56 56 pm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment