At the moment the two .gitignore are different but that means that means if the file exists in one (for example an extension in phpBB/ext/ in develop) then you checkout develop-olympus the files will remain there but start showing as un-staged but modified while in the develop-olympus branch.