non-FF merge from master
aland at deployingradius.com
Tue Nov 13 15:38:29 CET 2012
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?
> As mentioned previously, my "master" branch is pristine, and should be
> unchanged from upstream "master".
> Is someone doing "rebase" on master? If so, can I cast a vote for
> "please don't"?
I agree. I try to avoid forced pushes to master.
More information about the Freeradius-Devel