Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 14:59, Pascal Quantin wrote: Le sam. 12 oct. 2019 à 15:08, João Valverde > a écrit : On 12/10/19 13:33, Peter Wu wrote: On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: On 12/10/19 11:48, Roland Knall wrote:

Re: [Wireshark-dev] Migrate to GitLab?

Le sam. 12 oct. 2019 à 15:08, João Valverde < joao.valve...@tecnico.ulisboa.pt> a écrit : > > > On 12/10/19 13:33, Peter Wu wrote: > > On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: > > On 12/10/19 11:48, Roland Knall wrote: > > tl;dr - I am also -2 on merge commits, not entirely s

Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 13:33, Peter Wu wrote: On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: On 12/10/19 11:48, Roland Knall wrote: tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently w

Re: [Wireshark-dev] Migrate to GitLab?

On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: > > On 12/10/19 11:48, Roland Knall wrote: > > tl;dr - I am also -2 on merge commits, not entirely sure about ff > > either, they tend to be work, cherry-pick would be preferable. > > > > Long version: > > > > Currently we do have a

Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 11:48, Roland Knall wrote: tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently we do have a strategy in place, that is called "Cherry-Pick". Basically it means, that Gerrit resolv

Re: [Wireshark-dev] Migrate to GitLab?

Addendum - my initial tl;dr is misleading - I don't like FF because it is extra work, but I definitely prefer it if cherry-picking (as it is applied now) is not an option with gitlab (never looked that up properly). merge is a -2 in any case Am Sa., 12. Okt. 2019 um 12:48 Uhr schrieb Roland Knall

Re: [Wireshark-dev] Migrate to GitLab?

tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently we do have a strategy in place, that is called "Cherry-Pick". Basically it means, that Gerrit resolves any branch conflicts (the patch had been

Re: [Wireshark-dev] Migrate to GitLab?

As one who has never used GitLab, I'm uncertain about the changes. To educate me can anyone point to an instance of a merge commit in another project? If I understand them correctly (which might not be true) then I'm a -2 for merge commits. I really do NOT want to see master commit history pollut