Merge conflict pane keeps opening itself

[brendanfalkowski]

Description

There's a merge conflict in my branch. Atom desperately wants me to use the merge conlfict panel, and keeps re-opening it after I close the panel.

Steps to Reproduce

1. Have a merge conflict
2. Open some files
3. Close the merge panel
4. Save some files

Expected behavior:

Merge panel stays closed.

Actual behavior:

Merge panel re-opens itself whenever I save a file. This constantly gets in the way.

Reproduces how often:

100%

Versions

Atom 1.33.0 x 64
Mac 10.13.6

Additional Information

I prefer to keep Atom focused on code, and I need the screen space that panel keeps taking to see code.

I use Tower App for taking Git actions.

[annthurium]

hi @brendanfalkowski -- thanks for reporting. I can see how that's frustrating.

We're experimenting with ways of making the git functionality within Atom more discoverable, because a lot of users don't know about these features and could potentially find them useful. However, we don't want to annoy our users, so I'l consider adding some kind of guard against this kind of behavior where the merge conflict panel opens repeatedly even after it's been closed.

In the meantime, if you don't want to use any of the Git functionality in Atom, you can disable the package "github" within your atom settings and that should stop the merge conflict panel from popping open.

[brendanfalkowski]

@annthurium Thanks for the write-up!

I'd like to keep the GitHub package enabled because I do use the branch indicator/switcher.

It makes sense to open the conflict panel when conflicts are detected, and I did try it out the first time it appeared (it's nice). Keeping it hidden after it's manually hidden would be perfect.

[jarekwg]

Same here! The github package is neat for selecting which change i wish to keep with its little inline buttons. But that side panel is annoying. There should be a setting in the github package to disable it..