Resolve conflicts with Ours or Theirs for file without opening diff

119 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.

Done Suggested by: Pavel Kutáč (18 Aug, '21) • Upvoted: 21 Mar • Comments: 17

Comments: 17

30 Sep, '21
Joe
I too would like this option, I have some files that are so large Gitkraken crashes when opening the diff, so resolving without opening would be great.
08 Oct, '21
Tomas Radvansky
I just realised that this basic, essential feature is not part of gitkraken, app which is here for ages ?! I mean I cant comprehend how this actually happened. I've been using source tree for years, and I am quite use to multi-select actions. I just spend 15mins to open EVERY single conflicted file, manually select all my changes and click save. I mean surely this is not PAID software with I paid for year ahead, right ?!
16 Nov, '21
Christoph Merged
A merge conflict option like sourcetrees 'using mine / using theirs' would be nice.
07 Jan, '22
James Francis
I'll add a vote for this feature, I used it lots in SourceTree and it's painfully slow to do this in GitKraken one file at a time.
12 Jan, '22
Brakebein
I just stuck on this issue, too. GitKraken crashes when I try to open a large package-lock.json.
02 Feb, '22
Martin Thomsen
This is my main gripe with GitKraken as of now. The fact that I can't resolve multiple files at the same time. It's such a tedious and slow process to be forced to open the diff, then having to wait for the diff to load before I'm even allowed to select the version I want.
At least let me select ours/theirs and save before the diff loads as a workaround until a proper thing can be implemented.
I have to open sourcetree every time I have a merge with many conflicts, just to not waste so much time.
09 Feb, '22
Szymon Toda Merged
This is 1 of 2 reasons I aside from GitKraken have to use SourceTree. :( Super annoying + when I want to resolve big conflict like package-lock.json GitKraken simply crashes trying to display its diff so there is NO way to resolve some conflicts in your software. This feature would enable that.
18 Feb, '22
drdrak3 Merged
Duplicate of https://feedback.gitkraken.com/suggestions/203570/resolve-conflicts-with-ours-or-theirs-for-file-without-opening-diff
18 Feb, '22
drdrak3
Definitely a required feature, I dont want to have to diff large files and wait for a possible crash just to click "use mine" or "use theirs"
21 Feb, '22
Jonathan Admin
"Merge conflict option for 'using mine / using theirs'" (suggested by Christoph on 2021-11-16), including upvotes (17) and comments (2), was merged into this suggestion.
01 Mar, '22
Adamo
Tower 2 for Mac does this very gracefully, if you're looking for an example in the wild. That's a Cocoa (native) app however, not sure how difficult it is to do this with GK.
31 Mar, '22
bjorn-eric-abr
I ran in to this when diffing package-lock.json in a Node.js project - diff so large it crashes Kraken but no interaction before diff is loaded...
11 Apr, '22
Frank Severinsen
+1
Kicad files will often crash GK before getting to a mergable state.
Overall I would also wish the diff was faster and could handle bigger files (still talking KB size files)
18 May, '22
Jonathan Admin
Hello all! Users encountering merge conflicts can now right-click on the conflicts shown in the Commit Panel to reveal new options for easier and faster conflict resolution. The new options available are: Take Current, Take Incoming.

You may download the latest version from https://www.gitkraken.com/download or read the full release notes on https://support.gitkraken.com/release-notes/current/#version-850
20 May, '22
Adamo
Great that this has been introduced officially! I was really hoping to see an "Accept ALL incoming" instead of just having it file to file. There are times when I get hundreds of changes where I KNOW I just want the incoming changes. I'll still need to select each one, even with the new feature in, correct?
27 May, '22
Ivan Rusanov
Even with the "Take incoming" command It still crashes on a conflicting package-lock.json
09 Jun, '23
Colin
Hello
Idea :
https://gist.github.com/Panakotta00/c90d1017b89b4853e8b97d13501b2e62
I need to add diftool like this :
"C:\Program Files\Epic Games\UE_5.0\Engine\Binaries\Win64\UnrealEditor.exe" "C:\wkspaces\ProjectName\ProjectName.uproject" -diff "@sourcefile" "@destinationfile"
eg:

Other idea :
https://github.com/PlasticSCM/UEPlasticPlugin#merge-conflicts-on-blueprints