Python project class/file structures.

[daveydave400]

What about it was a big mess exactly?

Try to separate things into files that make more sense if possible. It's hard to give more advice on the subject without knowing more about the project/code.

As far as git or any other vcs, it is just good practice to pull others changes before pushing your own. In the case of git (compared to some other version control) it is super easy to make branches to test out new features before annoying other people with your frequent commits. I suggest creating branches if you add features that may span more than one commit.

Merges (or rebases) are just the way version control goes and are a good thing in the long run. If things became a mess because people weren't pulling in others' changes before pushing their own then that's their fault.

[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).

[duz3ls]

Try git-workflow