Hi everyone,
I was looking through the Gerrit configuration options a couple of days ago, and I came across a setting that I thought was kind of interesting and potentially useful, but I wanted some feedback before changing it in case everyone thinks its a terrible idea.
Gerrit can be configured to attempt a dry merge when showing the change to you and will then hide the "Submit" button if a clean merge is not possible. When this is hidden, it will show a box near the top (along with Topic, Owner, and the like) called "Can Merge" with a binary Yes/No value.
I personally think it'd be useful to avoid the "merge and immediately have Gerrit yell because it needed rebasing" scenario. It's also been pointed out to me that it could be confusing to people as well to have the button disappear.
Thoughts?
-Chad
Le 20/05/12 18:27, Chad wrote: <snip>
I personally think it'd be useful to avoid the "merge and immediately have Gerrit yell because it needed rebasing" scenario. It's also been pointed out to me that it could be confusing to people as well to have the button disappear.
Add a [Rebase] button and I will be happy :-)
On Sun, May 20, 2012 at 2:44 PM, Antoine Musso hashar+wmf@free.fr wrote:
Le 20/05/12 18:27, Chad wrote:
<snip> > I personally think it'd be useful to avoid the "merge and immediately > have Gerrit yell because it needed rebasing" scenario. It's also been > pointed out to me that it could be confusing to people as well to have > the button disappear.
Add a [Rebase] button and I will be happy :-)
2.4 :)
-Chad
Le 20/05/12 21:00, Chad wrote:
Antoine wrote:
Add a [Rebase] button and I will be happy :-)
2.4 :)
Relevant commit for the rebase button is: http://code.google.com/p/gerrit/source/detail?r=06e41266a https://gerrit-review.googlesource.com/#/c/32431
There is a v2.4-rc1 !!! :-]
wikitech-l@lists.wikimedia.org