Skip to main content

Questions tagged [branch]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
1 vote
3 answers
479 views

Is my git branch strategy best practice?

We are a small software team with 6 members. We are working on different software projects in our company. Before I joined the team no version control system was used. It was/is my task to reorganize ...
Jakob's user avatar
  • 31
1 vote
1 answer
1k views

Working on different release branches at the same time using git flow

In git flow, there is a point where you decide to create a branch from the current develop being the new release. For example 1.7. Everthing that is ready to this point is considered beeing in that ...
Jim Panse's user avatar
  • 398
1 vote
1 answer
657 views

How to improve my current development/release process

I'm looking for suggestions on how to modernise my development/release practices by potentially introducing some automation. I'll outline the current process to help explain why I'm currently ...
Mike Pearson's user avatar
-2 votes
1 answer
7k views

Why shouldn't I merge two feature branches in git-flow?

When there are two feature branches that has some dependencies, and they are work in progress, but some piece of code want to be shared, why shouldn't I merge a feature into another?
barathz's user avatar
  • 127
-2 votes
1 answer
147 views

Is there justification for testing only master in an integration environment?

We have a series of environments; Let's call them Development, Integration, Business and Production. As a rule, we do not let master get deployed beyond Development, meaning any code which is to be ...
Matt W's user avatar
  • 447
1 vote
1 answer
143 views

TFS Branching for Xamarin Common Projects

I have a solution for Xamamrin.iOS and Xamarin.Android application with structure as below, Solution Root Common Project Xamarin.iOS Project Xamarin.Android Project I need to branch both iOS and ...
Sisyphus's user avatar
  • 369