Git repo commits re-done?
Arran Cudbard-Bell
a.cudbardb at freeradius.org
Tue Oct 25 14:21:39 CEST 2011
On 25 Oct 2011, at 14:08, Phil Mayers wrote:
> Did something happen to the main git repo around July 10th ish? Since then, I'm unable to merge changes into my local "master"; several commits which I've already pulled have changed IDs e.g.
>
> commit db07aa6696271293bf42e35acff2c2a7e1baf907
> Author: Alan T. DeKok <aland at freeradius.org>
> Date: Sun Jul 10 17:30:54 2011 +0200
>
> Add connection pool API
>
> Currently unused, but it should be nice...
>
> ...changes to:
>
> commit c45d143ca34064677d5212697cf061270e031262
> Author: Alan T. DeKok <aland at freeradius.org>
> Date: Sun Jul 10 17:30:54 2011 +0200
>
> Add connection pool API
>
> Currently unused, but it should be nice...
>
> ...anyone know how I can fix my repo?
Simple way:
git checkout master
git reset --hard c45d143ca34064677d5212697cf061270e031262
git pull
You probably did a git pull between a rebase. Alan's fault not yours ;)
With the above you'll lose any local commits on master that haven't been pulled upstream.
Arran Cudbard-Bell
a.cudbardb at freeradius.org
Betelwiki, Betelwiki, Betelwiki.... http://wiki.freeradius.org/ !
More information about the Freeradius-Devel
mailing list