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.
229
questions
9
votes
2answers
385 views
Disadvantages for having completely different codebases in different git branches
One senior member of my team setup a new git repository for our product we are working on, since we are migrating from SVN to git. Our product consists of different software components that are ...
-2
votes
1answer
188 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?
-2
votes
1answer
55 views
How to handle dependecies between branches in git-flow?
I've been working on feature_A while another dev works on feature_B. Now, the other dev needs a small functionallity that's implemented in my feature_A, but I've not finished the whole feature itself. ...
-1
votes
2answers
79 views
Working on a two branches, that are not dependent by business meaning, but dependent by implementation
I have a class Foo with lots of fields and have two tickets to refactor that class.
the first ticket is to rename it to Boo and two move it to another package.
the second one is to rename some fields ...
1
vote
2answers
108 views
Releasing from feature branches
My app is being deployed on various platforms, among which GNU/Linux, iOS and Android. I am contemplating the branching model of the central C++ code git repo, upon which all platform-dependent code ...
0
votes
2answers
128 views
What's the correct Git flow to develop on two independent features + one feature that relies on both?
I'm trying to find the correct flow to manage this kind of development, where A and B are two independent features, and C is a third feature that relies on A and B.
An obvious approach would be to ...
6
votes
2answers
268 views
Versioning in parallel features development
I have a library (npm package, LIB) which is used by the application code (APP). In a release of APP, multiple features are worked on parallely. Sometimes these features need support from LIB, so the ...
1
vote
1answer
39 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 ...
2
votes
3answers
211 views
Using gitflow, when do people tend to close off the release branch?
We're using the gitflow branching strategy and it works well. What I can't seem to find though is a recommendation on what point people close their releases.
For example, suppose we got 4 ...
-3
votes
2answers
270 views
Using Github Branches to maintain two versions of a project?
I have a Github project for a Django web-app that one team uses. Other teams are interested in also using it and they'll need separate instances of it (it's a stock tracking database so they need to ...
2
votes
1answer
157 views
How to review and merge a big feature
We are creating a new page on our website which will require overall ~5000 LOC.
Now the problems here are:
How to get so many lines reviewed?
When to merge these changes to master for release?
How ...
0
votes
3answers
401 views
Does it actually matter from which branch you create a new branch in git?
Well as per title, does it matter in any way functionally (say when rewriting history or something), from which branch one derives a new branch?
If at the point of time when creating the new branch ...
37
votes
6answers
9k views
Whose responsibility is it to fix merge conflicts?
Say that A is working on a branch based off master and B merges changes into the master branch, which introduces merge conflicts between A's branch and master.
Whose responsibility is it to fix merge ...
-2
votes
3answers
224 views
What is the best GIT workflow with CI/CD with submodules in a master to a test environment and a stable branch to a production environment?
We have a several GIT repos in Azure DevOps with .NET Core web applications that are related to each other with the use of submodule (we used autocreation of NuGet Packages in a private NuGet store, ...
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
124 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 ~...
42
votes
5answers
11k 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 ...
3
votes
4answers
1k 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
270 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
164 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
172 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
253 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
188 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
621 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 ...
3
votes
4answers
2k 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
224 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 (...
6
votes
5answers
3k 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 ...
4
votes
5answers
1k 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 ...
0
votes
1answer
303 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
89 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
446 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
2k 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 ...
3
votes
1answer
66 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
395 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
75 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
145 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
945 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
484 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 ...
227
votes
14answers
42k 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
258 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
10k 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 ...
8
votes
4answers
4k 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 ...
-2
votes
2answers
825 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
139 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
661 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 ...
5
votes
4answers
2k 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
17k 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 ...
