title: When applying a patch is there any way to resolve conflicts?
body: <p>I am on windows. </p>
  
  <p>For various reasons we have multiple git instances of different svn branches. </p>
  
  <p>Many times I want to fix an issue in repository A, generate a patch, and apply it to repository B. This works fine except if there are conflicts. </p>
  
  <p>When rebasing I just right click the folder and use tortioseGit and select the resolve option. This brings up a nice gui to let me work through my conflicts. </p>
  
  <p>Is there any way to accomplish this with rejected patch chunks?</p>
  
  <p>Here is my current approach to creating/applying the patches</p>
  
  <pre><code>git format-patch master --stdout &gt; c:\\patch\\file.patch
  git apply --reject --ignore-space-change --ignore-whitespace c:\\patch\\file.patch
  </code></pre>