2

Me and my team are developing a feature using a remote branch (origin/our_feature_branch) off of main track (origin/dev). Gerrit is used for review etc.

Uplifting the remote branch is done with git merge origin/dev followed by fixing conflicts, committing and git push origin HEAD:refs/for/our_feature_branch.

Gerrit enforces a rule saying that only one commit at a time can be pushed. I cannot do anything about this.

Say I start working on doing an uplift:

git fetch
git checkout -b uplift origin/our_feature_branch
git merge origin/dev

But here I get stuck fixing some conflicts and the regression tests take some time to run, and some team member submits another commit to the feature branch in Gerrit. This commit is now on top of the base commit for my "ongoing" uplift.

What do I do now?

If I rebase my merge commit on the feature branch I remove the merge and add all commits merged in from origin/dev on top of it - not an option. If I merge with the feature branch I will end up with a merge on a merge and I will end up having to push two commits to Gerrit - also not allowed.

Is there a solution to this or do I have to re-do the merge and try to remember to tell everyone that we have a delivery stop next time I start working on an uplift?

Martin G
  • 17,357
  • 9
  • 82
  • 98
  • 1
    Have you tried rebasing the merge commit on the new commit using `git rebase -p`? – user4815162342 Nov 13 '15 at 14:27
  • Reading the documentation, `-p` looks promising. I'll give that a go when i get back in the office on Monday, thanks! – Martin G Nov 14 '15 at 04:28
  • 1
    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?)](https://stackoverflow.com/a/50555740/6309) – VonC May 27 '18 at 19:31

1 Answers1

3

As suggested in comments, git rebase -p solves the issue

Start to create the uplift commit:

git fetch
git checkout -b uplift origin/our_feature_branch
git merge origin/dev
git commit

Something is submitted to origin/our_feature_branch in Gerrit.

Do the following to rebase the merge commit and keep the merge:

git fetch
git rebase -p origin/our_feature_branch

Now the merge commit can be pushed to Gerrit and it will be based on latest on origin/our_feature_branch and the same origin/dev as before the git rebase -p

Martin G
  • 17,357
  • 9
  • 82
  • 98