title: GIT rebase merge branch
body: <p>I've got problem with GIT. I've got following situation:</p>
  
  <pre><code>       -&gt; M1 -&gt; M2 -&gt; ............. Ma -&gt; Mb -&gt; Mc            [master]
            \                                \
             \                                \ (merge 'master' to 'merge_branch' without commit 'Mc')
              \ (create branch 'develop')      \
               \                               /-&gt; A -&gt; A1      [merge_branch]
                \                             /
                 \                           / (create branch 'merge_branch' from 'develop' at 'Da')
                  \                         /
                   \ -&gt; D1 -&gt; ...........-&gt; Da -&gt; Db           [develop]
  </code></pre>
  
  <p>And I want to rebase branch 'merge_branch' (to start it from commit 'Db' instead of 'Da')</p>
  
  <pre><code>       -&gt; M1 -&gt; M2 -&gt; ................... Ma -&gt; Mb -&gt; Mc            [master]
            \                                       \
             \                                       \ (merge 'master' to 'merge_branch' without commit 'Mc')
              \ (create branch 'develop')             \
               \                                      /-&gt; A -&gt; A1      [merge_branch]
                \                                    /
                 \                                  / (create branch 'merge_branch' from 'develop' at 'Da')
                  \                                /
                   \ -&gt; D1 -&gt; ...........-&gt; Da -&gt; Db           [develop]
  </code></pre>
  
  <p>On master branch there are a lot of commits (thousands). When I am on 'merge_branch' and start rebase 'git rebase develop', I am receiving plenty of conflicts. </p>
  
  <p>I usually created a new branch, did a merge again, but I had to resolve the same merge conflicts as were resolved previously. It was much faster than rebasing branch, but also very slow... </p>
  
  <p>Do you have any ideas how to solve this problem?</p>