Add "accept theirs", "accept ours" git commands/context menu actions

I’m not sure how much this is due to me not being familiar with merging conflicts in vscode but I’m finding it next to impossible to use. For files with conflicts which vscode recognises (i.e. .py files) when I open the conflicted file it displays a bar at the top allow me to select the incoming changes or local changes. For all other files there doesn’t seem to be any way to accept / reject changes even at the file level (i.e. accept/reject all incoming changes)

i.e. I have an ipynb file with conflicts. Under MERGE CHANGES it has a C beside it. If I open the file it doesn’t present and options to diff or merge the files. I have nbdime installed but not sure how to configure it with vscode. But the issue also occurs for .log files etc.

If I right click on the files under MERGE CHANGES, there are options to ‘Accept All Current’ or ‘Accept All Incoming’. Neither of these appear to do anything, there’s no change to the indicators - the C icon is still displayed, and trying to stage continues to presents the warning “are you sure you want to stage xyz.ipynb with merge conflicts”

I’m having to resort to command line merging.

[joaomoreno]

What we’re missing are context menu commands which “accept theirs” or “accept ours”. The current ones come from the git merge built-in extension and need to be removed.

[aleksandarbos]

What’s the status on this one? Having a better way of handling binary file conflicts using VS code would be pretty handy.