[gerrit] How to merge a feature branch into master

30 views
Skip to first unread message

thomas....@adtech.com

unread,
Mar 3, 2014, 10:51:51 AM3/3/14
to repo-d...@googlegroups.com
Also this topic has been discussed a lot I have not found a article being precise about it.
OK let me explain shortly the scenario:

Working:

  a) branch: abc and origin/abc
  b) Using git-review all changes have been automatically merged into origin/abc

  Assume the change set is complete we would like to have whole implementation in master

  git checkout master
  git merge --no-commit --no-ff origin/abc

  I now have all changes locally in master (not committed)

Not working:

  I cannot push for know reasons because gerrit is behind.
  I change the .gitreview defaultbranch from "abc" to "master"
  When I do a commit of the merge I do NOT get a change id and of course a git review is rejected then
    =>  (missing Change-Id in commit message footer)
  Usually that is automatically generated. Why not in this case?

Any hint is appreciated ...

Regards,
Thomas

Reply all
Reply to author
Forward
0 new messages