Hi Pywikibot folks,
Not all of you are subscribed to Wikitech or just missed this announcement because of the high traffic of this list. The hackathon is in about 6 weeks. Would be nice to have a lot of you at this event!
Maarten
-------- Forwarded Message -------- Subject: [Wikitech-l] Wikimedia Hackathon 2017, Vienna: Registration Open Date: Mon, 6 Feb 2017 14:12:47 -0800 From: Rachel Farrand rfarrand@wikimedia.org Reply-To: Wikimedia developers wikitech-l@lists.wikimedia.org To: Wikimedia developers wikitech-l@lists.wikimedia.org
Hello!
Registration and scholarship applications for the WIkimedia Hackathon 2017 are open! The hackathon will be taking place in Vienna, Austria between 19 - 21 May, 2017. Scholarship applications are open until February 26, 2017.
- Register here: https://www.mediawiki.org/wiki/Wikimedia_Hackathon_2017/Register_and_Attend - Event details here: https://www.mediawiki.org/wiki/Wikimedia_Hackathon_2017 - If you have any questions, please email: hackathonwikimedia.at
Please forward this announcement along to any relevant mailing lists!
We hope to see you in Vienna! _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
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
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
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 mailto: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 mailto:pywikibot@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot https://lists.wikimedia.org/mailman/listinfo/pywikibot >_______________________________________________ pywikibot mailing list pywikibot@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot