| Issue 782: | Ignore merge commits? | |
| 3 people starred this issue and may be notified of changes. | Back to list |
What steps will reproduce the problem? 1. Do a merge (non fast forward) 2. Make some useful change and commit it 3. Push to Gerrit What is the expected output? What do you see instead? Gerrit shows the merge and the change as separate changes for review, but for the merge there is nothing to review since it shows only the auto-generated commit message. This requires me to do several clicks to approve the change, which I think Gerrit could have done for me.
Nov 24, 2010
Project Member
#1
edwin.ke...@gmail.com
Nov 24, 2010
"Merge commits in general are meaningful and should not be automatically submitted by Gerrit." I think it depends on your workflow. In my case we add changes to Gerrit so that they can be peer-reviewed and since there is nothing there to review, these are useless and wasting my time. In my case. I suppose this would best be made an optional behavior so that people can customize Gerrit to suit their own workflow / preferences.
May 19, 2011
There is an option in the next version of Gerrit to disallow uploading merge commits. Does that help you?
May 20, 2011
If you don't want to review merge commits, don't make them. Instead use `git pull --rebase` to rebase your work onto the upstream instead of merging. It will also result in a cleaner, easier to read history in the project. As Nasser pointed out, Gerrit 2.1.7 (coming real soon now!) will offer a new permission READ +3 that is required to enable uploading merge commits. Perhaps for your team do not grant this permission, forcing users to rebase if they accidentally created a merge commit.
Status:
WontFix
|
|
| ► Sign in to add a comment |