We're working in team with 5 to 6 people. All we are doing is creating a new branch on every new task and later merge it with development branch. Sometimes it's hard to mange locally even! I would like to know are we following best practices? or creating a branch per user is a good approach?
Your current workflow sounds good. A branch per user might not be the best approach given you may collaborate with other team members on a feature; that could get complicated using a branch-per-user workflow.
You may find that this article about Feature Branch Workflow validates your current practices.
https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
I would vow for the feature branch workflow. Has worked pretty well for us
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Even I am looking for this type of approach (one branch for feature). But the only question I have is : if there are 100 features then will I be creating 100 branches (not at once but gradually)? Can you please help me out.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
100 branches is no problem. As you merge your feature branches into your project, you can choose to Close source branch.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Per-task is generally a good idea along the same lines as a feature branch workflow.
If it’s too cumbersome, maybe do branches by story?
What about your current process seems troublesome?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
HI @DivyangD
I would say..branching mechanism is one of the best ways to use GIT.
Using branching the developers can work independently on their local branch, once done they can push the code to the remote repo so there is no dependency and while merging also you can merge a single branch to master/dev branch.
Multiple teams can work on a single repository at a same time.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Hi @Yogesh Mude, thanks for prompt reply! Yes agree with you, but what if we create branches per user? for instance, we have 5 team members in a team, I would create 5 branches and commit their code into it, once they done with one task, they would create a pull request to the development branch. Is there bad in this approach?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.