When you play a lot with branches and kind of keep track of what should or shouldn't be merged between them, there's kind of a magical set of commands to force-overwrite your code with a specific branch:
git fetch --all git reset --hard origin/master
Make sure you have commited all your changes to some branch before you do it :-)
On Wednesday 21st of January 2015, the UCL (Université Catholique de Louvain), through an e-mail from its rector's advisor and its co-rector for education and training, announced that it would abandon the development (and usage) of Claroline over a period of 18 months. There's a little mention about Claroline Connect being "immature" at this time, and a comparison between (exclusively) Claroline, Claroline Connect and Moodle in terms of the direction in which the UCL is going and the uniformization of its online education. They decided to go with Moodle for the foreseeable future.