title: Flatten Git tree with resolved merge conflicts to svn dcommit
body: <p>So I have a branch with a lot of merges that resolve conflicts. As such simply rebasing to flatten the history isn't time effective.</p>
  
  <p>I need to flatten the history so that it can be committed to svn via dcommit (Other methods such as third party tools would be acceptable as well). Unfortunately I need to keep in tact the actual commits.</p>
  
  <p>Is there a way I can flatten the tree so that it is linear in this case?</p>