[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Help with git rebase recovery, please

From: David Kastrup
Subject: Re: Help with git rebase recovery, please
Date: Wed, 04 Jul 2012 13:20:59 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux)

"Trevor Daniels" <address@hidden> writes:

> I just made a mistake with git rebase and lost a branch I'd like to
> recover, but I don't know how or even if it is possible.
> Here's what I did.
> I checked out branch A
> then entered
> git rebase master
> This gave merge conflicts, and the usual three options.
> I decided not to resolve the merge conflicts at this point, but
> incorrectly entered
> git rebase --skip
> This repositioned branch A at master, apparently losing the changes it
> previously contained.
> I should have used git rebase --abort I guess.
> So, can I now recover my original branch A?

You already got one answer that is more appropriate right now,
probably.  What I tend to do right after goofing up is something along
the line of

git reset --hard "address@hidden minutes ago}"

Yes, git understands that quite as written.

David Kastrup

reply via email to

[Prev in Thread] Current Thread [Next in Thread]