Hi Evan,
2014-01-30 Evan Huus :
> On Thu, Jan 30, 2014 at 2:35 PM, Gerald Combs wrote:
>> On 1/30/14 6:17 AM, Bálint Réczey wrote:
>>> Hi,
>>>
>>> 2014-01-30 Evan Huus :
I believe the simpler answer is that the submit type has been set to
"Merge If Necessary" which means if changes are
On Thu, Jan 30, 2014 at 2:35 PM, Gerald Combs wrote:
> On 1/30/14 6:17 AM, Bálint Réczey wrote:
>> Hi,
>>
>> 2014-01-30 Evan Huus :
>>> I believe the simpler answer is that the submit type has been set to "Merge
>>> If Necessary" which means if changes are not submitted exactly on top of
>>> the
On 1/30/14 6:17 AM, Bálint Réczey wrote:
> Hi,
>
> 2014-01-30 Evan Huus :
>> I believe the simpler answer is that the submit type has been set to "Merge
>> If Necessary" which means if changes are not submitted exactly on top of the
>> change they were authored on, Gerrit will produce a merge au
On Thu, Jan 30, 2014 at 3:17 PM, Bálint Réczey wrote:
> Hi,
>
> 2014-01-30 Evan Huus :
> > I believe the simpler answer is that the submit type has been set to
> "Merge If Necessary" which means if changes are not submitted exactly on
> top of the change they were authored on, Gerrit will produce
The rebase button should exist as soon as the main repo (or at least
the commit the change derived from) is no longer HEAD. Gerrit will add
the button at that point. But the merge messages may still pop-up on
their own nether-the-less.
The whole thing is a question of mastering your own repo. Gerr
Hi,
2014-01-30 Evan Huus :
> I believe the simpler answer is that the submit type has been set to "Merge
> If Necessary" which means if changes are not submitted exactly on top of the
> change they were authored on, Gerrit will produce a merge automatically.
I suggested using "Cherry Pick" for "
I believe the simpler answer is that the submit type has been set to "Merge If
Necessary" which means if changes are not submitted exactly on top of the
change they were authored on, Gerrit will produce a merge automatically.
I expect this was done to reduce rebase conflict when the repo is busy
Hi
I've noticed, that there are now quite a few merge commits in the main
wireshark repo:
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=history
All of them are trivial merges, which means, that local git branches
of the developer have been merged by a "git pull" with the global git
