Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,556,538
Community Members
 
Community Events
184
Community Groups

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
AUG Leaders

Atlassian Community Events