At BlueSpice, we build the distribution package from REL1_31 (LTS) branch. We have developed a new release in a custom branch called REL1_31_dev. Now, after we released, we'd like to merge all REL1_31_dev into REL1_31 and keep the commit history. A workflow could look like
git checkout -b REL1_31_dev origin/REL1_31_dev git checkout -b REL1_31 origin/REL1_31 git merge -X theirs REL1_31_dev git clean -fdx git add -A git commit -m "Merge branch REL1_31_dev"
This will result in dozens or hundreds of commits to be pushed to origin. We have enabled "Merge review" for our repositories, so git push results in
! [remote rejected] REL1_31 -> REL1_31 (prohibited by Gerrit: ref update access denied)
Of course we do not want to create new reviews on gerrit for all these commits.
- Can you give us advice on how to deal with this?
- Would it be possible to enable "Merge review" AND "Open push" at the same time?
- Would it be possible to limit "Open push" to a certain user account?
Any advice is much appreciated!