Thanks a lot!

xqt

"Merlijn van Deen (valhallasw)" <valhallasw@arctus.nl> hat am 30. Mai 2017 um 07:55 geschrieben:

Sorry, that's my fault. While trying to figure out the Travis issue yesterday, I tried to get an overview of the different branches using git log --graph --oneline, which gave me something like this:

https://i.imgur.com/miVMekx.png

As I couldn't think of a reason why merging is better than rebasing, and rebasing would give a much easier to understand commit log, I changed Gerrit's '+2' setting from 'Merge if necessary' to 'Rebase if necessary'.

Apparently there *is* a reason why merging is better :-) so I have reverted my change. My apologies for breaking your workflow!

Best,

Merlijn

On 30 May 2017 at 06:19, <info@gno.de> wrote:

Hi folks,

what might be the reason that jenkins-bot rebases all my changes when submitting them with CR+2 since yesterday?

This mixes up my local repository and breaks dependencies of patches.

Greetings

xqt

_______________________________________________
pywikibot mailing list
pywikibot@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot

_______________________________________________
pywikibot mailing list
pywikibot@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot