An option to take whole file while resolving merge conflict

9 votes

As a user, I want the ability to right click a file while merging to take whole file.

A shortcut for "git checkout --theirs/ours <filename>" would be greatly appreciated.

Done Suggested by: Kári gunnarsson (09 Dec, '21) • Upvoted: 09 Jun, '23 • Comments: 2

Comments: 2

17 Mar, '23
Reese Jenner
I have something like 50 files with conflicts and there's no resolve on tree paths, I don't have git installed so I can't do git merge --theirs/ours. This is a must have. I have to use other tools for the conflict/git native
21 Mar, '23
Joey Kelroy Admin
Hello all, this was implemented and you ca resolve conflicts by right-clicking the file and selecting current or incoming. You can see more on this here.

https://help.gitkraken.com/gitkraken-client/branching-and-merging/#resolving-a-conflicted-file-using-current-or-incoming

Additionally, you can command/ctrl + click conflicted files and then right-click to resolve multiple.