Github: unable to merge after resolving merge conflict through context menu

[ungb]

Repro:

1. Open the project: test2.zip
   on atom. (should be in a merge conflict state).
2. In the context menu, resolve conflict as ours or theirs
   
3. Stage the merge conflict file that is now resolved
4. Attempt to commit after resolving conflict

Expected: file shows up in stage view and can commit now that merge conflict is resolved

Actual: Can't commit and file isn't showing up in stage view. You can commit in terminal though.

Versions

Atom Version (atom --version):
Atom : 1.16.0
Electron: 1.3.13
Chrome : 52.0.2743.82
Node : 6.5.0

GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head):
09961fe08c1783fc91ad2e8614a5ad948aa8b08f

[ungb]

/cc @smashwilson do you know if this is prioritize? This issue makes the context menu almost unusable.

[dantebarba]

Same here.

[TheDiveO]

me too.

[kostadinnm]

+1 for fixing this
In the meantime I'll try the "git plus" package for those kind of override-only commit&pushes

[treyd]

I found if you manually edit the file after clicking "Stage all" you can re-stage the changed files and can finally click 'commit'.

[hayimd]

was this resolved? because it still doesnt work for me!

On 1.26.1 x64, OSX 10.13, git version 2.14.3 (Apple Git-98)

[ghost]

Still broken on 1.45.0