> $ git checkout 0.9-bugfix > fatal: Entry 'po/af.po' not uptodate. Cannot merge. I(m not an expert of git at all, but if you daon't have modify anything, try: git checkout -f 0.9-bugfix And read the wiki :) -- ivoire | Rémi Duraffort