GitKraken User Suggestions
All suggestions
Merge conflict option for 'using mine / using theirs'
This suggestion has been merged into another suggestion:
Resolve conflicts with Ours or Theirs for file without opening diff