Open rzeigler opened 8 years ago
I should note that this is an intermittent issue. It usually happens after I start the merge or perform some other git operation (like successfully staging a file when it does work).
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.
This one should be taken care of by the new git and GitHub package for Atom, where we do intelligent serialization of git operations in an async queue and only permit one writing operation to proceed at once. If you do see something similar, please file an issue there to let us know. Thanks 🙇
Upon completing all of the merge conflicts in a directory, selecting stage from the top popup does nothing. The only way to stage is from the conflicts list on the bottom bar. Furthermore, the only way to make the stage/maybe later popup go away is to select maybe later.