When applying a patch is there any way to resolve conflicts?

Question

I am on windows.

For various reasons we have multiple git instances of different svn branches.

Many times I want to fix an issue in repository A, generate

Answer 1

TortoiseGit has a merge feature that can open patch files.

There's a picture of it here.