I hope this is the right forum. I have myself and a cofounder working on a project at the same time and we run into the issue that if one of us makes a change to the same asset (a material, blueprint, the level etc) we get a git error about local files being overwritten and have to backup our work, and then overwrite our local files with whoever made the commit & push. ?
Our solution was to have 3 copies of all assets a _user1, _user2, and _master version but while I have not tested this fully yet, I would think this would make any casting and merging to the _master more complex than it needs to be.
What is the best solution? We are using bit-bucket private and SourceTree on a single branch.
Edit: Would perforce and a dropocean setup be a good solution since it integrates with the editor? Its just I work on the GUI for example which is tied to an actor blueprint and they have casts and bindings back and forth but if I edit the actor blueprint and commit then push, and he pulls, then it overwrites anywork he did on his actor blueprint at best, and errors out and prevents pulling period.