Subject: Re: master branch reset

From: Andreas Schwab <[email-masked]>
Date: Tue, 05 Dec 2006 13:34:57 +0100

Geert Uytterhoeven <[email-masked]> writes:

> On Tue, 5 Dec 2006, Sylvain Munaut wrote:
>> try git pull -f -v
>
> Thanks, that worked!
>
> But as I already started recloning and the old tree had some conflicts after
> the pull -f, I just switched to the new clone.

You can always wipe the slate clean with git reset --hard, that will give
you a fresh start.

Andreas.

-- 
Andreas Schwab, SuSE Labs, [email-masked]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."