Github: 🙏 Ability to disable merge conflict view

[rmehner]

Hey there,

the merge conflict view is super neat, but it confuses the hell out of me and I ended up with having wrong merges more than once. It's probably due to my workflow and nothing particular bad with this feature, at least I don't have any productive ideas how to improve it. I now fall back to vim whenever I need to solve merge conflicts. It would be super neat, if I can simply disable the feature altogether, while still being able to use the rest of the package :)

So yeah, that's all, a low prio feature request, maybe you get around to do it. Thanks a lot for your work!

[nuflowx]

I love the feature too, but if I have loads of merge conflicts in one file I'd need to disable that to get a clear understanding of the code.

+1

[nuflowx]

Okay, just figured out an easy workaround. Always just pick me for whatever part your looking at and straightaway undo and it will leave you with the standard view

[smashwilson]

You can also choose "Dismiss" from the "..." menu on the conflict decoration to clear the controls individually.

(I am open to having the ability to disable them in general too. Although I generally try to resist a proliferation of checkboxes :wink:)

[rmehner]

You can also choose "Dismiss" from the "..." menu on the conflict decoration to clear the controls individually.

Nice, didn't even know that. That's a click more than I'd like, but given that this is not where I spend the majority of my day, I'm totally fine with that. Thanks for pointing this out!

Although I generally try to resist a proliferation of checkboxes

Gotcha. For my purpose, I'd be fine with just having a preference that I can set in some cson-file, but as said above, the whole "Dismiss"-thing is good enough for my use case. Although "Dismiss" might not be the best wording, as my first understanding would be to dismiss the changes, but that might be just me as a non-native speaker :)

For all what I want, consider this closed. Thanks again!

[dkniffin]

I'd still like to request this feature be added. As someone who still does all git commits and such via command line, this is way too "GUI" of a way of managing git conflicts for me.

[bronson]

Heh, I had no idea "..." was even a menu. I figured it was minimized text or something and never thought to click it.

Would it make sense to change this icon to a down-arrow or something more "menuey"?

[ungoldman]

Please allow disabling merge conflict view in package settings:

Disabling the github package altogether seems to have weird side effects.

[trobertsonsf]

Please, please make this configuration in settings. I really just want this feature of the product disabled altogether. Please give us a nice way to turn it off in settings.

[Grantimus9]

This would be very desirable. I've tried to adapt to the GUI but have found it does not work for me. Thanks Atom team.

[GeoffreyPlitt]

Please let me turn this off.

[tim1mw]

+1 for being able to turn this off, it's really, I find it to be a hindrance not a help.

[yagudaev]

I agree with all the above, I find it extremely confusing what the final result of the merge would be. This is especially annoying when trying to do a rebase where I want some of the changes from one
part and some of the changes from another part.

Thanks for showing the dismiss, I used to open it back in Sublime to edit it properly because I find it so hard to use.

[spaultx]

I also find it extremely confusing to when you have to merge changes from multiple branches. Is there a way to turn of merge conflicts through UI ?

[Arcanemagus]

@spaultx The PR that closed this issue added a setting controlling this.

Under Settings -> Packages -> GitHub simply disable this setting: