non-FF merge from master
p.mayers at imperial.ac.uk
Tue Nov 13 15:55:08 CET 2012
On 13/11/12 14:38, Alan DeKok wrote:
> Phil Mayers wrote:
>> I just had another "update (forced)" pull when I did "get fetch --all"
>> on the master branch, followed by a failure to "git merge" onto my local
> When was your last pull?
Actually, looking closer at it I think I might have been unlucky and
done a pull during the brief period on Oct 28th before Arran corrected
the repo; so I had the "middle" stage as "master".
So it's already "known". Sorry for the noise!
More information about the Freeradius-Devel