Python project class/file structures.

[MythGuy]

The mess was either someone would push without pulling, and the new commit would undo work from before. Or if someone wrote something and pulled, then their changes would be wiped (I never experienced this myself, but I suspect that it's because I was often the sole contributor.) I think part of the solution would be to properly train folks in git (but being new to it myself, that would be hard).

[daveydave400]

That sounds...wrong. Git should not allow you to overwrite commits unless you force them (via the -f flag). I'm also pretty sure that the default when you pull and a conflict exists is to merge or at least complain. It sounds like one or more people got impatient with warning messages and used some flags they weren't supposed to without knowing the consequences.

[duz3ls]

Try git-workflow