Add handling of conflicts in pull requests

9 votes

When creating a pull request from GitKraken, the app will inform you of a "Merge conflict detected."

While GitKraken will show the list of conflicted files when creating the pull request, it would be great to minimally be able to choose to globally accept mine or theirs (using the branch names to prevent confusion).

Later it could be more granular ie. mine or theirs per file and later still, the individual conflicts within a file could be edited in the UI choosing mine or theirs per conflict.

Under consideration Suggested by: Michael Rans (02 Jul, '21) • Upvoted: 09 Feb, '23 • Comments: 1

Comments: 1

13 Sep, '21
Lyndon Gingerich
Unless I am mistaken, GitKraken has already implemented selection between sources on per-conflict and per-file basis, but it would be nice to be able to choose one version for all conflicts at once.