Sourcetree plus git best workflow

unity3d-profile-design-pattern

We are 4 devs working on a single game, artists and developer combined

The way we are doing it is having, individual branches dev1 , dev2 , dev3 , dev4, and developer branches.

Each dev pushes the changes in his own branch When it's time to integrate what I do is a pull from the respective branch into developer.

Is this workflow accurate to ensure changes from all devs are saved into developer branch,  If not what's the correct workflow for doing this ?

 

Assuming developer is the first branch from main and all 4 branches separated from here

Teck Hooi

My suggestion is to have a single develop (developer) branch and have the completed features merged back into the develop branch. Merge quickly back to the develop branch instead of having long-running branches like dev1, dev2, etc. This is to make sure no feature is missed out during testing and you save the time meant for integration. Furthermore, if you leave everything to "integration" to merge all the changes back to the `develop` branch, the changes might be overwhelming to deal with