288

Take the following case:

I have some work in a topic branch and now I'm ready to merge back to master:

* eb3b733 3     [master] [origin/master]
| * b62cae6 2   [topic]
|/  
* 38abeae 1

I perform the merge from master, resolve the conflicts and now I have:

*   8101fe3 Merge branch 'topic'  [master]
|\  
| * b62cae6 2                     [topic]
* | eb3b733 3                     [origin/master]
|/  
* 38abeae 1

Now, the merge took me some time, so I do another fetch and notice that the remote master branch has new changes:

*   8101fe3 Merge branch 'topic'  [master]
|\  
| * b62cae6 2                     [topic]
| | * e7affba 4                   [origin/master]
| |/  
|/|   
* | eb3b733 3
|/  
* 38abeae 1

If I try git rebase origin/master from master, I'm forced to resolve all conflicts again, and I also lose the merge commit:

* d4de423 2       [master]
* e7affba 4       [origin/master]
* eb3b733 3
| * b62cae6 2     [topic]
|/  
* 38abeae 1

Is there a clean way to rebase the merge commit so I end up with a history like the one I show below?

*   51984c7 Merge branch 'topic'  [master]
|\  
| * b62cae6 2                     [topic]
* | e7affba 4                     [origin/master]
* | eb3b733 3
|/  
* 38abeae 1
Improve this question
6
  • 98
    TL;DR: git rebase --preserve-merges origin/master Commented Mar 1, 2012 at 7:38
  • 7
    With respect to having to re-resolve conflicts, you might want to take a look at git rerere. Commented Feb 19, 2016 at 7:37
  • 1
    git config --global pull.rebase preserve to always preserve the merge commits during a rebase Commented Jan 19, 2018 at 11:15
  • 15
    Warning: starting with Git 2.18 (Q2 2018, 5 years later), git --rebase-merges will ultimately replace the old git --preserve-merges. See What exactly does Git's “rebase --preserve-merges” do (and why?) Commented May 27, 2018 at 19:30
  • 19
    --preserve-merges is deprecated. Use git rebase --rebase-merges origin/master Commented Oct 11, 2019 at 11:38

5 Answers 5

Reset to default
217

There are two options here.

One is to do an interactive rebase and edit the merge commit, redo the merge manually and continue the rebase.

Another is to use the --rebase-merges option on git rebase, which is described as follows from the manual:

By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."

Improve this answer
Sign up to request clarification or add additional context in comments.

11 Comments

I tried the -p option, and it does indeed leave the commit history as I wanted, but it forces me to resolve the conflicts again, even in files which were not edited in origin/master. As of your first suggestion, which would be the precise sequence of commands?
@jipumarino: git rebase -i (tell it to edit the merge commit), when it gets to the merge commit, git reset --hard HEAD^, git merge, fix conflicts, git commit, git rebase --continue. You might also want to look at git rerere which is supposed to help with this kind of thing (but I've never used, so I can't offer any advice or help).
Thanks. I enabled rerere and tried with rebase -p and it's working as it should.
Here's an excellent blog post describing this exact situation: Rebasing Merge Commits in Git
rere is not the solution, as you still have to resolve merges manually the first time across.
|
72

Ok, it's an old question and it already has an accepted answer by @siride, but that answer wasn't enough in my case, as --preserve-merges forces you to resolve all conflicts a second time. My solution is based on the idea by @Tobi B but with exact step-by-step commands

We'll start in the same state found in the original question:

*   8101fe3 Merge branch 'topic'  [HEAD -> master]
|\  
| * b62cae6 2                     [topic]
| |
| | * f5a7ca8 5                   [origin/master]
| | * e7affba 4
| |/  
|/|   
* | eb3b733 3
|/  
* 38abeae 1

Note that we have 2 commits ahead of master, so cherry-picking won't work.

  1. First of all, let's create the correct history:

     git checkout -b correct-history # create new branch to save master for future
 git rebase --strategy=ours --preserve-merges origin/master

    We use --preserve-merges to save our merge commit in history. We use --strategy=ours to ignore all merge conflicts as we don't care about what contents will be in that merged commit, we only need a nice history.

    The history will look like this (ignoring master):

     *   51984c7 Merge branch 'topic'  [HEAD -> correct-history]
 |\  
 | * b62cae6 2                     [topic]
 * | f5a7ca8 5                     [origin/master]
 * | e7affba 4
 * | eb3b733 3
 |/  
 * 38abeae 1

  2. Let's get the correct index now.

     git checkout master # return to our master branch
 git merge origin/master # merge origin/master on top of our master

    We may get some additional merge conflicts here, but that would only be conflicts from files changed between 8101fe3 and f5a7ca8, it doesn't include already resolved conflicts from topic

    History will looks like this (ignoring correct-history):

     *   94f1484 Merge branch 'origin/master'  [HEAD -> master]
 |\  
 * | f5a7ca8 5                   [origin/master]
 * | e7affba 4
 | *   8101fe3 Merge branch 'topic'
 | |\  
 | | * b62cae6 2                     [topic]
 |/ /
 * / eb3b733 3
 |/  
 * 38abeae 1

  3. The last stage is to combine our branch with correct history and branch with correct index

     git reset --soft correct-history
 git commit --amend

    We use reset --soft to reset our branch (and history) to correct-history, but leave index and working tree as is. Then we use commit --amend to rewrite our merge commit, that used to have the incorrect index, with our good index from master.

    In the end we will have this state (note another id of top commit):

     *   13e6d03 Merge branch 'topic'  [HEAD -> master]
 |\  
 | * b62cae6 2                     [topic]
 * | f5a7ca8 5                     [origin/master]
 * | e7affba 4
 * | eb3b733 3
 |/  
 * 38abeae 1
Improve this answer

5 Comments

This is awesome and helped a lot! But I did not get the trick with commit --amend: could you add more info on that? What exactly happens after you run it -- I noticed SHA of commit got changed - but why? Or what happens if you don't run this?
@ZenJ git commit --amend adds the changes to the last commit (HEAD, in this case the merge commit). Because the commit contents change, the hash is updated.
For people that don't have 'rerere' enabled prior to fixing conflicts, this solution is great because it saves you from having to fix conflicts again. Thanks!
So, to summarize: #!/bin/bash onto=$1; branchname=$(git rev-parse --abbrev-ref HEAD); git branch -D tmp-correct-history; git checkout -b tmp-correct-history; git rebase --strategy=ours --preserve-merges $onto; git checkout $branchname; git merge $onto; git reset --soft tmp-correct-history; git commit --amend
isnt preserve-merges now deprecated and rebase-merges the new name for this flag?
8

Given that I just lost a day trying to figure this out and actually found a solution with the help of a coworker, I thought I should chime in.

We have a large code base and we have to deal with 2 branch heavily being modified at the same time. There is a main branch and a secondary branch if you which.

While I merge the secondary branch into the main branch, work continues in the main branch and by the time i'm done, I can't push my changes because they are incompatible.

I therefore need to "rebase" my "merge".

This is how we finally did it :

1) make note of the SHA. ex.: c4a924d458ea0629c0d694f1b9e9576a3ecf506b

git log -1

2) Create the proper history but this will break the merge.

git rebase -s ours --preserve-merges origin/master

3) make note of the SHA. ex.: 29dd8101d78

git log -1

4) Now reset to where you were before

git reset c4a924d458ea0629c0d694f1b9e9576a3ecf506b --hard

5) Now merge the current master into your working branch

git merge origin/master
git mergetool
git commit -m"correct files

6) Now that you have the right files, but the wrong history, get the right history on top of your change with :

git reset 29dd8101d78 --soft

7) And then --amend the results in your original merge commit

git commit --amend

Voila!

Improve this answer

Comments

1

It looks like what you want to do is remove your first merge. You could follow the following procedure:

git checkout master      # Let's make sure we are on master branch
git reset --hard master~ # Let's get back to master before the merge
git pull                 # or git merge remote/master
git merge topic

That would give you what you want.

Improve this answer

1 Comment

With rerere enabled, this seems to gives the same result as the rebase -p solution given above by siride.
-2
  • From your merge commit
  • Cherry-pick the new change which should be easy
  • copy your stuff
  • redo the merge and resolve the conflicts by just copying the files from your local copy ;)
Improve this answer

1 Comment

This answer looks good but would be more useful if you gave the actual git commands, in case a user is new to git

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.