git-diff-apply
Use an unrelated remote repository to apply a git diff
Use an unrelated remote repository to apply a git diff
Resolve multiple image conflicts at the same time
Manual merge tool
(Fork) Use an unrelated remote repository to apply a git diff