[Insight-developers] Gerrit Push failure translation needed

[David Cole]

If you want to abandon a mistaken merge or rebase, and reset your
local master to match origin/master, do:

  git checkout master
  git reset --hard origin/master

This will put you in sync with the origin and reset your working tree to match.


On Wed, Jul 13, 2011 at 1:26 PM, Matt McCormick
<matt.mccormick at kitware.com> wrote:
> Hi Hans,
>
> git cherry-pick might be what you want.
>
> http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html
>
> - Checkout master.
> - Checkout a new branch from master.
> - cherry-pick the commit sha.
>
> Hope this helps,
> Matt
>
> On Wed, Jul 13, 2011 at 1:20 PM, Johnson, Hans J <hans-johnson at uiowa.edu>
> wrote:
>>
>> Arrg,
>>
>> It must have been a accident during comment fixing of a rebase.  I
>> accidentally did a rebase of HEAD~5 instead of HEAD~4, and probably
>> introduced a spurious space or something silly in the comment of Bill's
>> "Style" topic.
>>
>> If you can QUICKLY tell me how to revert just one patch to the
>> origin/master version, I'd appreciate it.  Otherwise I'll go reading the
>> git documentation.
>>
>> Thanks,
>> Hans
>>
>>
>> --
>> Hans J. Johnson, Ph.D.
>> hans-johnson at uiowa.edu
>> Assistant Professor of Psychiatry
>> University of Iowa Carver College of Medicine
>> W278 GH, 200 Hawkins Drive
>>
>> Iowa City, Iowa 52242
>> Phone:  319-353-8587
>>
>>
>>
>>
>>
>>
>>
>> -----Original Message-----
>> From: David Cole <david.cole at kitware.com>
>> Date: Wed, 13 Jul 2011 12:22:51 -0400
>> To: Hans Johnson <hans-johnson at uiowa.edu>
>> Cc: ITK <insight-developers at itk.org>
>> Subject: Re: [Insight-developers] Gerrit Push failure translation needed
>>
>> "change 2064 closed" means it was merged or abandoned already... In
>> this case, it's already merged:
>>
>>  http://review.source.kitware.com/#change,2064
>>
>> But that's for Bill Lorenson's "Style" topic. I'm not sure how your
>> RenameTxxToHxx topic is mapping to that change.......
>>
>>
>> On Wed, Jul 13, 2011 at 12:15 PM, Johnson, Hans J
>> <hans-johnson at uiowa.edu> wrote:
>> > I just received this message from gerrit.
>> > error: failed to push some refs to
>> > 'hjmjohnson at review.source.kitware.com:ITK'
>> > To hjmjohnson at review.source.kitware.com:ITK
>> > ! HEAD:refs/for/master/RenameTxxToHxx [remote rejected] (change 2064
>> >closed)
>> > Can someone please give me a translation of this error?
>> > Thanks,
>> > Hans
>> >
>> >
>> > ________________________________
>> > Notice: This UI Health Care e-mail (including attachments) is covered by
>> >the
>> > Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is
>> >confidential
>> > and may be legally privileged.  If you are not the intended recipient,
>> >you
>> > are hereby notified that any retention, dissemination, distribution, or
>> > copying of this communication is strictly prohibited.  Please reply to
>> >the
>> > sender that you have received the message in error, then delete it.
>> >Thank
>> > you.
>> > ________________________________
>> > _______________________________________________
>> > Powered by www.kitware.com
>> >
>> > Visit other Kitware open-source projects at
>> > http://www.kitware.com/opensource/opensource.html
>> >
>> > Kitware offers ITK Training Courses, for more information visit:
>> > http://kitware.com/products/protraining.html
>> >
>> > Please keep messages on-topic and check the ITK FAQ at:
>> > http://www.itk.org/Wiki/ITK_FAQ
>> >
>> > Follow this link to subscribe/unsubscribe:
>> > http://www.itk.org/mailman/listinfo/insight-developers
>> >
>> >
>>
>>
>>
>> ________________________________
>> Notice: This UI Health Care e-mail (including attachments) is covered by
>> the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is
>> confidential and may be legally privileged.  If you are not the intended
>> recipient, you are hereby notified that any retention, dissemination,
>> distribution, or copying of this communication is strictly prohibited.
>>  Please reply to the sender that you have received the message in error,
>> then delete it.  Thank you.
>> ________________________________
>> _______________________________________________
>> Powered by www.kitware.com
>>
>> Visit other Kitware open-source projects at
>> http://www.kitware.com/opensource/opensource.html
>>
>> Kitware offers ITK Training Courses, for more information visit:
>> http://kitware.com/products/protraining.html
>>
>> Please keep messages on-topic and check the ITK FAQ at:
>> http://www.itk.org/Wiki/ITK_FAQ
>>
>> Follow this link to subscribe/unsubscribe:
>> http://www.itk.org/mailman/listinfo/insight-developers
>
>