Resolving conflicts during git rebase
<p>For the sake of simplicity, imagine following case:</p>

<pre><code>      D---E---F--- ... ---Z  topic
     /
A---B---C                    master
</code></pre>

<p>I'd like to rebase on master, so that the <code>D</code> to <code>Z</code> "chain" is after <code>C</code>, however, all the <code>D</code>, <code>E</code>, <code>F</code>, ..., <code>Z</code> commits creates a conflicts when rebasing them 1 by 1. Let's just say that each of them has a conflict on a different line with commit <code>C</code>.</p>

<p>I'd like to resolve all those conflict at once and not in the rebase interactive mode (<code>--continue, --abort, --skip</code>), or what ever it is. My question is whether it's totally bad to ignore the conflicts and do the conflict resolution at the very end. By a new explicit commit or in the last rebase step.</p>

<p>By ingoring I mean: <code>git add -A &amp;&amp; git commit</code></p>

<p>This will lead to the history where some commits contain the code-base in the state that's not working, right?</p>

<p>ps. I don't wan't to be merging, I'd like to rebase.</p>