[Wikitech-l] Amsterdam Hackathon 2013

2012-12-01 Thread Maarten Dammers
Hi everyone, Unlike previous years the big European Hackathon won't be in Berlin, but in Amsterdam. We're aiming to do the hackathon in May 2013 with a preference for the weekend of Saturday the 25th. To make sure this is a good weekend I've set up a straw poll at

Re: [Wikitech-l] problems merging changes from master - remote branch

2012-12-01 Thread Roan Kattouw
On Fri, Nov 30, 2012 at 2:12 PM, Arthur Richards aricha...@wikimedia.org wrote: ! [remote rejected] HEAD - refs/publish/esisupport/bug/41286 (change 32896 closed) It looks like https://gerrit.wikimedia.org/r/#/c/32896/ is a commit that you submitted to esisupport at some point, then abandoned,