Hi.
Also NEVER push/pull when unity is still open.
So thing are not stored until you close unity, especially (nested) prefabs and templates.
also if you changed something on a prefab and when you play the behavior is incorrect, try restarting unity 1st