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.
216
questions
4
votes
6answers
2k views
Making recursion optional: Bad practice?
Let's say I have a function like this:
/*
Mode is a bool that determines whether the function uses
it's recursive mode or not
*/
public static int func(int n, boolean mode) {
if (!mode) ...
2
votes
1answer
112 views
Git model: branches for features based on master
I organize my Git projects based on the article A successful Git branching model. The problem is that I don't know how to handle the following case:
develop: working on a major app redesign (taking ~...
40
votes
5answers
9k views
Is it better to merge “often” or only after completion do a big merge of feature branches?
Say multiple branches are being developed, A and B, as well as a incremental "bug fix" branch C.
Now C is already "finished" and merged into master. A and B are still in development and will not be ...
2
votes
4answers
184 views
Can long lived feature branches be justified by merging master into the feature branch daily
I've always considered long lived feature branches a symptom of some underlying problem, but I've recently moved jobs and the company I am working for now encourages long lived feature branches. They ...
0
votes
1answer
88 views
Branching strategy with GitHub releases
I am working on the project where currently we have following three fixed branches
Develop - The code is deployed to development environment. It's a base branch for anyone who want to add new ...
1
vote
1answer
143 views
Where to commit small, miscellaneous changes
Let's assume that I am working on a small project that uses feature branches to organize tasks. For example, feature/login would be for working on the login functionality and feature/create-new-post ...
0
votes
1answer
145 views
Any advice for Git workflow using branch per development team (and not per feature)
In our project, we have 5 teams working on a monolithic application in 3-week sprints. Until now, all commits go into master (via Gerrit). Our test pipeline is too lengthy to ensure quality pre-commit,...
4
votes
3answers
251 views
What's the best approach when you need to work off two branches that still have pending PR requests?
Let's say I have branch-1 (branched off master (major update)) and branch-2 (also branched off master (minor update)).
What is the best approach to do when I need to create another branch, e.g. ...
0
votes
2answers
168 views
Need a Git branching how-to
Using GitFlow, I created a new class on the develop branch and gave it a property:
Public Class Class1
Public Property Property1 As String
End Class
I committed that change and created a new ...
-2
votes
1answer
220 views
Unit tests branch best practices [closed]
I'd like advice about on the best practice for Pull Requests organizing on middle size project. Especially relating to Unit Testing.
Currently we create branch for each feature, what is practically ...
2
votes
4answers
486 views
Managing QA testing when there's pressure to merge things at the earliest possible
I'm working in a team of 12 where we have around 8 developers and a QA. We do not follow a git flow model but we do have feature branches where individual feature developments take place and then ...
0
votes
0answers
98 views
Git feature branch workflow for multiple branched features
I wanted to summarize a quick discussion we had in my stand-up today. We have a big feature branch merge coming up in our system. We are replacing the old live, system (branch master) with a redesign (...
4
votes
5answers
447 views
Git branches: Merging issues while having multiple release branches
We have to support multiple releases, so we are following git branching model similar to the above diagram. Now the problem is that we have to do lots of merging here example for fix/011, we are ...
3
votes
5answers
555 views
Versioning: Where exactly in the code or repository should I write the version number?
Right now I'm doing this:
Update the readme to include the new version number and what it does.
Commit the version number in git commit message (i.e git commit -m "1.2.1: this does that").
Push the ...
-1
votes
1answer
112 views
Branching strategy when utilizing open source application
I'm looking for advice on what a good branching strategy looks like when using mostly open source code. Most of my dev experience is with writing and working with custom made code and only using open ...
1
vote
3answers
85 views
Do I need to 'deploy' my web project when I can just keep a recent clone of the Master-branch in public_html?
We have git installed on our webserver (via cpanel), but unfortunately no CI- / Deployment-Tools.
Would it be good practice just initialise our repository in /public_html/ and push our local Dev-...
-4
votes
1answer
51 views
How to track features in trunk based development?
As far as I understand in trunk-based development there are no long lived feature branches, one could even argue that there are no branches because at the end everything will be merged back to trunk ...
-1
votes
1answer
228 views
Implement Branching strategy in DevOps for Multi-Tenant application
I have asked this question on Stack Overflow and I got a suggestion of posting it here for better suitability. So here is my question :
I am new to DevOps, and i have a solution with Umbraco as CMS, ...
1
vote
4answers
735 views
What are the risks of having a release branch?
Currently we manage our source code in a Microsoft Team Foundation Server project. We have the following branches:
Development
Feature 1
Feature 2
Etc.
Test
The process is that development is ...
2
votes
1answer
54 views
managing multiple git repo that are similar [closed]
We are creating several websites, the main content will be the same across each of them but there will be some differences (e.g. extra button, extra texts, different styling)
what is the best way to ...
-1
votes
1answer
57 views
Should I further branch off of a new branch or continue developing an additional feature in the same branch?
I have a branch (dashboard) which I am developing a new feature on.
To make the example easy to follow, I am developing two separate functions (function1() and function2()).
They work how I want ...
3
votes
1answer
356 views
Does it matter which branch I push to?
My question is around how branch pushes work exactly; I have come across something that doesn't make logical sense to me and as such would like an explanation as to why I am experiencing this ...
0
votes
2answers
72 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
124 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 ...
6
votes
2answers
503 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
387 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 ...
224
votes
14answers
38k 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
197 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 ...
42
votes
7answers
9k 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 ...
4
votes
4answers
2k 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
469 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
129 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
440 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 ...
2
votes
4answers
783 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
18 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. ...
118
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
233 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
490 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
1k 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
852 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
101 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 ...
5
votes
1answer
5k 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 ...
67
votes
7answers
23k 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
1k 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 ...
3
votes
4answers
2k 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
685 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 ...
2
votes
3answers
2k 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 ...
21
votes
3answers
13k 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 ...
4
votes
1answer
194 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
197 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 ...
