88

I have the following situation:

  • I created a clone(Y) from a main repository(X), because there were many people working on Y we didn't do any rebase but only merges. When we want to deliver(push) Y to X we would like to do a rebase in order to have things nice and clean

The problem is that when doing rebase we are asked to do all the merges that we already did in the previous merge steps. Is there a solution to this, beside the one that means actually re-doing the merges?

I expected it to be pretty straightforward since we already solved the conflicting merges.

рüффп
  • 4,865
  • 34
  • 67
  • 109
INS
  • 10,164
  • 4
  • 56
  • 88

5 Answers5

144

git merge --squash is now my preferred way of rebasing after a large amount of work and many merges (see this answer). If the branch you're working on is called my-branch and you want to rebase from master then just do the following:

git checkout my-branch
git branch -m my-branch-old
git checkout master
git checkout -b my-branch
git merge --squash my-branch-old
git commit
Community
  • 1
  • 1
Jon Lemmon
  • 3,507
  • 2
  • 24
  • 38
86

Rebasing to get a "clean" history is overrated. The best way if you want to preserve history is just to do the merge instead of a rebase. That way if you ever need to go back to a revision, it is exactly the same as the one you tested during development. That also solves your issue about the previously solved merge conflicts.

If you don't care about preserving history, you can create a new branch off of master, check it out, then do a git read-tree -u -m dev to update your working tree to match the dev branch. Then you can commit everything into one big commit and merge it into master as normal.

Karl Bielefeldt
  • 45,012
  • 10
  • 59
  • 90
  • 1
    What you've effectively done here is a merge. The new branch is unnecessary. – isak gilbert Aug 13 '14 at 01:43
  • 2
    @isakgilbert It's only the same if you merge with `--squash`. A regular merge will add _N_ or _N + 1_ commits to master if there were _N_ commits on the branch. The suggestion above, or `merge --squash`, will always add only a single commit to master. – peterflynn Mar 17 '15 at 17:40
  • 3
    @ytpete, yes exactly. I feel the above is just a roundabout way of doing a merge --squash from dev to master. "Creating a new branch" is just pointing at the same place as master is. "Commit everything into one big commit" is just doing the squash. – isak gilbert Mar 17 '15 at 22:18
  • 3
    merge commits are noisy when trying to see the full set of changes on a single branch. It's a pain to extract the diff and look at it when a clean history makes it simple. – Ajax Mar 05 '19 at 23:56
  • 5
    I couldn't disagree more with with a "clean" history is overrated. It's not overrated it saves time and makes things less confusing. – basickarl Mar 06 '20 at 09:35
  • 1
    I also could not disagree more. I want to see clean, atomic commits, with the logical intent of the change contained all in one commit, not spread over multiple commits. – thewoolleyman Jun 30 '20 at 20:04
  • I hate it when someone does a commit, then do a local merge with some latest commit from master, and then the remote git(like github) does yet another merge on the pull request. – Fai Ng Nov 06 '20 at 02:44
14

Two remarks:

  • you can rebase your own (non yet pushed) work as many time as you want on top of newly fetched commits.
  • You could avoid the merge conflicts (during rebase) if you had activated git rerere, which is done for this kind of situation.
    http://git-scm.com/images/rerere2.png See more at git rerere.
HostileFork says dont trust SE
  • 32,056
  • 10
  • 97
  • 159
VonC
  • 1,129,465
  • 480
  • 4,036
  • 4,755
  • @lulian: in that case, if you have to rebase your work, I think you will have to do those merge conflict resolutions again. – VonC Jun 06 '11 at 08:09
  • @krlmlr Thank you. I have restored the link, added an illustration and a reference to the man page of that command. – VonC Dec 11 '13 at 12:56
9

You can take all of the changes in your branch and put them into a new commit in master with the following:

git diff master > my_branch.patch
git checkout master
patch -p1 < my_branch.patch

Then stage your files and commit.

dbaston
  • 779
  • 1
  • 9
  • 19
3

Regarding the replay of merge conflicts, you can use git rerere to maintain a database of how merge conflicts have already been solved, so that performing a rebase that results in the same conflicts will have the laborious parts done for you automatically.

https://hackernoon.com/fix-conflicts-only-once-with-git-rerere-7d116b2cec67

git config --global rerere.enabled true

The one thing to look out for is that if you resolved something incorrectly it will be automatically borked for you next time too, and you may not really realize it.

More formal documentation here: https://git-scm.com/docs/git-rerere

Ajax
  • 2,389
  • 22
  • 19