[Sugar-devel] [sugar-build] Not possible to fast-forward

[Daniel Narvaez]

Hello,

next time you try to pull latest sugar-build you are going to get an error
like this

* Pulling sugar-toolkit-gtk3

Command failed: git merge --ff-only origin/master

fatal: Not possible to fast-forward, aborting.


To solve it, just

rm -rf sugar sugar-toolkit-gtk3

Sorry for the inconvenience, this was necessary to solve the diverging
history issue we had with pootle.

-- 
Daniel Narvaez
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130610/26554421/attachment.html>