Reputation: 581
In Git server, I have a branch "For_Dev" in which the developers will be committing all changes. At some point, when we decide to merge this branch with "master" branch(which have stable code), I want to merge all the changes in "For_Dev" branch to "master" only after a code review through gerrit thus preventing unstable commits into "master". How can I implement this? In nutshell, I want to use gerrit code review only while merging the branch to master.
Upvotes: 1
Views: 3756
Reputation: 3497
After finishing the development on For_Dev
(all the commits pushed to remote branch) someone then fetches the changes into local For_dev
and merges into local master
. It will creates a merge commit (if the hook does not include changeId, then insert one manually with ammend the merge commit). This change then can be pushed to refs/for/master
. But my opinion is that all the commits should be review separately, since it is better to examine a small change at once.
Upvotes: 2