Common source control mistakes

common source control mistakes

not using source control
versioning inside source control. e.g. uploading a v1, v2, v3 to a git or Perforce repo
not uploading source files but release or compressed files, e.g. this
not locking a file
when several people work on a project simultaneously , you will at points have conflicts. Code can often be merged, but you can’t merge raw data like textures, meshes, game-files.
To prevent this, you can use a file locking system. Both git and perforce support this.
relying on auto merge.
there are several tools and apps out there that attempt to auto merge your code in case of a conflict. e.g. unity smart merge, beyond compare, …
Do not blindly trust the result and always manually check & test the result. It often messes up.