Handle conflicts
Currently, resolving merge conflicts needs to be done manually. I am slightly surprised that "Staged selected" does not work, I'll try to investigate why that is. What would you say to a workflow which would look something like this:
clicking on a conflicting file would open something like a diff, but just showing the conflicts;
goto source should work in the diff the diff should have a menu action, when clicking on a conflict header, allowing to either take the local version or the remote version (something like VS Code has)
staging a conflicting file would mark it resolved (i.e. run git add on it), provided it has all the conflicts resolved
unstaging a conflicting file would mark it as unresolved (though I am not quite sure how to do this in git, will need to read up on this)
Atm, I am not quite sure how to handle (in git) marking only a part of a file as resolved (e.g. resolving only some conflicts within a file)