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

2012-12-03 Thread Arthur Richards
Awesome Roan, thank you. That did the trick. On Sat, Dec 1, 2012 at 3:30 PM, Roan Kattouw roan.katt...@gmail.com wrote: 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

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,

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

2012-11-30 Thread Arthur Richards
I am trying to merge a bunch of changes that have occurred in the master branch of the MobileFrontend extension to a remote branch (esisupport), but git review errors out, failing on a change that had been abandoned in the remote branch. First I merged the changes from master to a local checkout