Resolve conflicts with Ours or Theirs for file without opening diff

14 votes

The tool in GitKraken for managing conflicts is cool when you are solving conflicts one by one.

But sometimes I just want to use "Use all ours" or "Use all theirs" for one or more files. And now I have to open the diff tool, select the A or B on top and do the save.

When there are many files it is taking too much time. Also if file is too long, the loading time of diff is taking some extra time. Would be nice to have a context menu for file or folder which could make it much faster.

Under consideration Suggested by: Pavel Kutáč Upvoted: 08 Oct Comments: 2

Comments: 2

Add a comment

0 / 1,000

* Your name will be publicly visible

* Your email will be visible only to moderators