Stack Exchange Network

Stack Exchange network consists of 174 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.

Visit Stack Exchange

Questions tagged [branching]

Branching, in revision control is the duplication of an object under revision control so that modifications can happen in parallel along both branches.

0
votes
2answers
60 views

Will introducing a long standing Dev branch create unnecessary maintenance overhead?

I am seeing bad practices occurring in our version control where my colleagues are creating their own versioning system with stored procedures so that they can compare results before/after changes and ...
0
votes
1answer
91 views

Differences between branching and virtual methods

I was trying to find more info on the matter but could only find this: In C++ why and how are virtual functions slower? The answer says that the virtual call "Get[s] the right function address from ...
4
votes
2answers
196 views

Is there a recommended Git branch strategy for two products in the same repo?

My team has a Git repo for a large service that incorporated a related, but fairly unique, micro-service. We recently decided to separate out the micro-service into its own service in terms of release ...
-4
votes
3answers
181 views

Is it reasonable for DevOps to insist on 2 branch only integration?

I am the DevOps/CI for my team of somewhere around 10 developers. We develop and implement a sophisticated scientific data collection and visualization web application. I am the person who introduced ...
213
votes
13answers
34k views

New developer can't keep up with branch merges

I am the new developer - this is my first programming position. My issue is this: We use git - I cut a branch from our develop branch, then I start working on the minor task I've been assigned. It's ...
0
votes
1answer
30 views

TFS/VS Branching strategy with separate Web API's

So we have 3 branches that match our environments for all our projects (Dev, Test, Main). We have a dev server, test server, then production server and when we commit to each branch a build and deploy ...
43
votes
7answers
8k views

How do you handle integrating code from multiple branches/developers each sprint?

Just got off a retro call where developers expressed concern around the integration of their stories into the master branch each sprint. The developers all code within their own branch and towards the ...
3
votes
2answers
351 views

Do we really need a master branch or can we release straight from a release branch?

Currently we have the following branches: Develop Release 1 Release 2 etc.. Master When we want to cut off new features for a release, we create a new release branch (say release 3). We then only ...
-3
votes
2answers
130 views

Source control with multiple customer-specific repositories

Here is a diagram of how our source control setup is configured. The issue with this setup is how we handle various customers. I would really like to use a different approach than copying the entire ...
3
votes
2answers
126 views

How to convert multiple Git repositories for related code into proper branches/tags

Background I've recently become the technical lead/senior developer for a small R&D/data science team. I've got a decent amount of non-lead experience in bigger development teams, but I've not ...
1
vote
1answer
260 views

TFS Branch (Lifetime) management

Our team uses TFS for version control. Our branching strategy is as follows: We have a main branch that we use as the dev branch In a four-weekly cycles, we release our software When this is done, a ...
1
vote
4answers
250 views

How do we avoid development files in the release?

Situation: Our Python project is hosted at GitHub. The actual release should only contain handful of files, but or project also contains several non-release files that are required for testing and ...
1
vote
0answers
17 views

How can I make sure a branch gets duplicated in my development and main branches in TFVC?

I inherited a Visual Studio solution with a Main branch, a QA branch off of Main, and a DEV branch off of QA. It seems these are the only branches and they've existed for the lifespan of the solution. ...
116
votes
5answers
16k views

What are the advantages of using branching as a solo developer?

First off, I am aware that many questions have been asked about VCS as a solo developer, but they are often too broad. This concerns only branching, and still it has been marked as a duplicate...the ...
0
votes
2answers
197 views

The two-storey branching scheme **before** the develop branch

I have found many posts about how to organize work on develop branch and up to release branch. Or even how to work without the develop branch. The trend of the "develop" branch going away, ...
3
votes
1answer
302 views

Where should an on-team QC perform testing in a feature branching scenario?

I have searched and found a few questions talking about testing in relation to feature branching. My question is a little different. We are a scrum* team of 4 to 5 developers with a dedicated on-...
7
votes
1answer
533 views

How to apply environment specific changes within the classic Git branching model?

I understand classic branching and deployment model as saying (in some small variant of the below): makes the changes on dev branch merge dev > staging branch, deploy to staging server, test it out ...
0
votes
1answer
531 views

How to properly develop in different SVN branches with Eclipse IDE?

I recently got into a slight argument with the other developer on my team about the correct way to develop with SVN and Eclipse. My way of developing in multiple branches is by creating new workspaces ...
-2
votes
1answer
93 views

Using git on a project with different areas

I'm starting a new project and I'd like to plan it's use with git (using SourceTree) before starting. I work as a self developer and I'm starting a project that will have 3 different areas. This is ...
3
votes
1answer
2k views

How does one name branches that are bug fixes for a release branch in git-flow?

In order to have make sure all code eventually goes through pull request code review, we've started creating branches for features and bug branches off of develop following the git-flow style. The ...
44
votes
7answers
10k views

Working on a branch with a dependence on another branch that is being reviewed

How does git help deal with the scenario below: I have a task broken down into 2 parts: backend task and frontend task. I make a pull request to merge the backend changes and wait for it to be merged ...
3
votes
1answer
576 views

use of the master branch in Git branching models

I've seen branching models with a develop and master branch (with features being merged into develop first), where the master branch was always entirely part of the history of develop and would be ...
2
votes
4answers
901 views

Should versions be bumped in dev branches or master branch?

I have released API 1.0.0 in the master branch (default branch). Since then I have separately branched to branches api2/foo and api2/bar, both containing backwards-incompatible changes. The API ...
1
vote
3answers
549 views

How to improve our branching model?

I work as a release manager in a company with 15 internal developers and 10 external developers. Setup Code base is a heavily modified Magento (PHP) Test suite is almost non-existent but is ...
0
votes
0answers
50 views

What is the best practice regarding cloning defects when branch a code base?

My department regularly branches our main trunk into a long living branch, to support customers with small change requests, that don't want to take on the risk of a new major release from the main ...
3
votes
3answers
984 views

Should I merge the dev branch into my user story branch?

We have a relatively simple version control process: master branch, dev (otherwise known as integration) branch, and our individual branches for every user story. We check out from dev, branch at the ...
17
votes
3answers
6k views

Where should QA team do the testing in Gitflow branching model

We are a big team (10-12 developers and 4 qa) working on multiple projects with the same git repository. Its a spring boot based backend web service. We are looking for a good git branching and deploy ...
5
votes
1answer
187 views

How can I split work done in one branch without conflicts on merge?

Scenario: I have a production (P) branch and my current (C) branch I created to work on some new features. Some of them are ready, however work on the rest will take more time than anticipated. I ...
3
votes
3answers
187 views

How to restore a feature using Git?

Suppose the following scenario: A new design for a specific page is required. I create a new branch for that design. I implement the design, and merge back into the master branch. Time goes by and ...
5
votes
1answer
167 views

At what PBI level should I be creating branches?

I have been making the mistake creating branches at the User Story Level. See: User Stories != Features. I believe I have been doing it this way because of my poor practice in organizing Features ...
2
votes
2answers
230 views

How to address tangential refactorable code in a feature branch

[Summarized answers inserted] When working in a feature branch and I find code that should be refactored that is not related to the branch aside from the fact that it is in the same file I am working ...
1
vote
2answers
303 views

One huge git repository: How to handle releases and branching?

Imagine the following git repository: / /ProductA/product_a_main.py /ProductB/product_b_main.py /SharedLibrary/shared_library.py SharedLibrary is used by both ProductA and ProductB. ProductA and ...
1
vote
2answers
101 views

Avoid wrong variable on branch commit

Our frontend web software contains, inside a file called url.js a variable used as URL root for REST webservices. var url = "https://devappserver:8080"; During development on developer PC, for ...
2
votes
2answers
157 views

How to publish 2 feature branches on QA?

I have the following scenario: Joe is working on the feature-xx branch. Richard is working in another feature-yy branch. Their company has a qa.myapp.com environment where testers work. Joe pushes ...
-1
votes
1answer
208 views

development branch information in release management tool

I'm designing a tool in my organisation to help me with release management. The organisation is composed of several small teams that manage their own repositories in git. The release manager is ...
10
votes
1answer
4k views

Where does refactoring belong in GitFlow branch naming model?

I recently started working with GitFlow model as implemented by bitbucket. And there is one thing that is not completely clear to me. We try to regularly address our technical debt by backlogging, ...
0
votes
0answers
81 views

Changes across repositories and branch names - Best Practice

I need to make some changes that are going to take place over a few repositories. When creating new branch names for each repository is it recommended to give the branches the same name in each ...
5
votes
3answers
928 views

Do we need a separated branch for fixing bugs raised during the testing phase?

Before release a new version of the software, which is a web application, my company creates a release branch. The QA team tests that branch and reports some issues. Should developers commit the ...
4
votes
1answer
332 views

Branching strategy for moving feature branch between versions

At my workplace, we use an SVN repository for the source code, which holds the main application and some other projects, and for the main application it is structured like this: - trunk - app - ...
19
votes
8answers
1k views

Keep branches from piling up

We're beginning to run into a problem as we get bigger, where features make it to staging for testing, but by the time everything is tested and approved new features are on staging for test. This is ...
25
votes
8answers
3k views

Git - What issues arise from working directly on master?

I have seen lots of advice about git branching models and the most common opinion seems to be that making changes directly on the master branch is a bad idea. One of our co-workers is quite happy ...
4
votes
2answers
831 views

Long-term branch - when and how to merge it?

In my computer science capstone project, we have a team of 5 working on various things for an Android app for Pokemon as a multiplayer game (Github). One or two people are working on implementing the "...
2
votes
2answers
126 views

Using Pull Requests with different commits

For a new project we try to set up the development process and the intention is to have a simple, pragmatic process. We use Atlassian Stash with Git in our company. We came up with the following ...
0
votes
1answer
48 views

How to work with starter kits and their updates?

When I start a new project based on a nice starter kit like this Angular 2 one. How do you keep up with changes to a base repo like this? I know that it is a 'starter', but it would be nice to merge ...
3
votes
1answer
388 views

SVN best practices - different code logic in branches

While working with one project I was assigned to, I noticed a small problem with our SVN strategy. A few months ago, someone created a new feature branch from our trunk. In this branch he implemented ...
6
votes
1answer
223 views

Workflow for a Github fork with compatible and incompatible changes

I've forked a Github repo and added an upstream remote as described here. I expect to make some backward-compatible bug fixes for which I'd like to submit upstream pull requests, as well as some ...
3
votes
2answers
407 views

Git workflow - possibly long running branches for future release

I am a member of a small team which is part of a larger team of developers working with Git. We (the larger team) have a main branch in a central repository into which we commit our work for the next ...
0
votes
1answer
264 views

Simpler git-flow model, am I doing it right?

I'm trying to implement a branching model that is similar to git-flow, but simpler (no release or hotfix branches). The idea is to have the master branch always up to date with the latest tagged ...
4
votes
1answer
196 views

Branches, builds, releases and multi-platforms

I'd like to check what best practices are avail out there. I have the following requirements: I have a repo which is used for development (master and develop branches). I would like to keep track of ...
1
vote
2answers
687 views

Git - single or multiple branch

I am working on this project of mine where I am the only developer. I have chosen git for the version control for the project. Currently, I work from multiple systems and commit to the master branch ...