On conflict, GitHub for Windows puts me in “rebasing” state, how to go from there?

Question

I recently started using GitHub for Windows.

I just got a conflict. On command line I would know how to handle this, but GitHub for Windows choosed to put me in a state

Answer 1

You first need to end the rebase mode by calling git rebase --continue once you resolved your conflicts. This should then put you back on the branch you were pulling (in your case master). You'll notice this happens when the command line (posh-git plugin) will indicates master instead of REBASE

Then you could push using git push origin master. The extra parameters may be autofilled by Git, but that'll depends on your settings.