You are missig .meta files, prefabs use guuid to link the different resources and objects it needs.

Best course of action is to delete your Library, temp and Obj folder, let Unity regenerate everything, make a clean commit on a separate branch and when merging into your working brach take all from origin to block the override.