v3.1.x

[Alan DeKok]

On Jun 7, 2016, at 4:53 PM, A.L.M.Buxey at lboro.ac.uk wrote:
> 
>>  If anyone updated v3.1.x from github earlier today, you'll have to do a force pull to get the head of v3.1.x.
> 
> I was wondering what was going on a pull left the source non-compilable...
> 
> what force pull do you advise? 

git reset HEAD^^^^^^^^^^^
git checkout .
git pull --rebase

  and that should work.

  Alan DeKok.