Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Sourcetree plus git best workflow

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

1 answer

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

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,080 views 5 13
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you