[Insight-developers] Cherry picking

[Bill Lorensen]

I tried
git reset --hard
but not
git reset --hard origin/master

After I picked it said my master was ahead by X commits.

I think I should have first:
git checkout -b foobranch
then a cherry pick.

On Fri, Jul 8, 2011 at 11:47 AM, David Cole <david.cole at kitware.com> wrote:
> With master checked out, you should be able to simply:
>
>   git reset --hard origin/master
>
> To get back to a sane state after a mishap like you've described... Did you
> try that?
>
>
> On Fri, Jul 8, 2011 at 11:38 AM, Bill Lorensen <bill.lorensen at gmail.com>
> wrote:
>>
>> Brad,
>>
>> I blindly tried to cherry pick a gerrit patch and messed up my repo.
>> It picked into my master and I could not get back to a clean state.
>>
>> It's been a while since I cloned. About time anyway...
>>
>> Back to my old workflow.
>>
>> Bill
>> _______________________________________________
>> 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
>
>