How to force rebase when same changes applied to both branches manually?

Posted by Dmitry on Stack Overflow See other posts from Stack Overflow or by Dmitry
Published on 2010-04-21T21:15:19Z Indexed on 2010/04/21 21:53 UTC
Read the original article Hit count: 299

Filed under:
|
|
|
|

My repository looks like:

X - Y- A - B - C - D - E             branch:master
     \                  \
      \                  \ merge master -> release
       \                  \
        M  ---  BCDE  ---  N         branch:release 

Here "M - BCDE - N" are manually (unfortunately!) applied changes approximately same as separate commits "A - B - C - D - E" (but seems GIT does not know that these changes are the same). I'd like to rebase and get the following structure:

X - Y- A - B - C - D - E     branch:master
                        \
                         *   branch:release 

I.e. I want to make branch:release to be exactly the same as branch:master and fork it from the master's HEAD.

But when I run "git rebase master" sitting at the branch release, GIT reports about lots of conflicts and refuces rebasing. How could I solve this?

Other explaination of this: I'd like to "re-create" branch:release from scratch from master's HEAD. And there are a lot of other people who had already made "git pull" for the branch:release, so I cannot use git reset + git push -f.

© Stack Overflow or respective owner

Related posts about git

Related posts about rebase