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.
248
questions
0
votes
2
answers
139
views
Workflow for Writing Database Migrations for a Team
I am wondering what some possible workflows are for writing database migrations for a team of developers. We seem to run into a problem where one person writes a migration, names it and gives it a ...
- 109
3
votes
2
answers
1k
views
Branching strategy for multiple team working on same repository
I am trying to come up with a branching strategy.
We have two teams working on the same product which is kept in one repository. Both teams have different release plans and if both teams merge on ...
- 139
0
votes
3
answers
352
views
Is there any advantage of pushing branches to GitHub without an associated PR?
I work with other Software Engineers on a web app product. Also, the source code is hosted on GitHub.
There is a behavior pattern that I do not understand. Some co-workers push branches (adding ...
- 139
1
vote
1
answer
1k
views
Branching strategy for developing multiple features at the same time
We are doing a mobile app development and currently, we have Dev - UAT - Stating - Main branches.
We branch from the Main branch as feature/fA for feature development.
Do our development in that ...
- 135
2
votes
3
answers
296
views
How to maintain multiple release branches simulateously (git)
This question has probably been discussed to death, but I don't feel like I have a good answer. I work at a company where customers are on different versions of our product. When a bug is found, we ...
- 2,505
-1
votes
2
answers
1k
views
Can I split a feature branch and then merge it back to the origin master branch without any issues?
I'm working on a project where the master branch is protected.
Usual workflow: Always create feature branches off master and then send PRs. Once that has been merged into origin/master, I can pull it ...
- 117
2
votes
3
answers
270
views
Static types and dependencies in trunk-based development
There're certain things in code that can't be conditional. Two very common examples:
static types
dependencies.
You can't naturally enable/disable a feature that implies a new dependency or a new ...
- 139
1
vote
1
answer
664
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 ...
- 388
1
vote
2
answers
373
views
Where to put technical updates in git branching flow?
From time to time you need to do technical updates, like:
Update versions of your dependencies
Update the version of your parent POM, you build tool etc.
Leave out those updates that have a firm ...
- 512
4
votes
4
answers
1k
views
Git: Best practices for using updates from one branch in another
My team is working on building a bunch of automated tests for our project. Each automated test targets a "customization" our client ordered to modify an existing website.
The current flow is:...
1
vote
2
answers
209
views
GitHub Versioning - Organizing Structure
I am making a JS library that creates graphs and charts using canvas. I have hosted it on GitHub as a public repository.
So after looking at some other related questions, I have figured out two ...
- 23
4
votes
5
answers
5k
views
How to properly manage bugfixes for released versions in git flow
We follow git flow, see https://nvie.com/posts/a-successful-git-branching-model/
Lets imagine the following situation:
We have a current version 2.0.8 on our prod environment. After a while, several ...
- 388
2
votes
2
answers
731
views
How to handle code reviews on a collaborative feature branch
We are using GitHub as our source code repository along with Visual Studio. We are going to start to use the GitFlow branching model, so a new feature request will be branched off and worked on in ...
- 131
4
votes
5
answers
822
views
How to manage depolarization of completed work on Agile Scrum
Description is too long, but this is a pain point.
I just want to understand whether this is also practice of Agile, if yes, how to overcome some of the issues mentioned below. Thank you.
We are ...
- 157
4
votes
2
answers
1k
views
When creating a fix, how does branching off the release candidate branch compare with cherry-picking from master?
When we have bug/hotfix for the release candidate, we branch off of the RC branch and merge that fix back into the RC branch. We also merge (git merge, not cherry-pick) that fix into the master branch ...
- 51
1
vote
2
answers
424
views
Git branching model that support small changes and downstream dependencies
Challenge:
I am implementing a microservice/app/applet.
Several features will be delivered
As things develop later features rely/depend on earlier Pull-Requests (PR)
Developer resoruces are finite, ...
- 149
-2
votes
2
answers
223
views
Is there a legitimate case for short lived, destructible release branches?
At my current workplace there are some projects that when preparing a release will
backup the current RELEASE branch by making a branch from it with the current date (this isnt technically required, ...
- 194
0
votes
1
answer
2k
views
Trunk Based Development and Long Lived Release Branches
My very large team is following trunk based development with many short lived features branches, trunk, and a release branch for when we create release artifacts. This is a team that keeps the release ...
- 3,238
0
votes
2
answers
488
views
What is the best way to organize Hotfixes
I work at a rather small company, around 10 devs and we are facing a lot of problems with merges and so on, I figured it could be because of the amount Hotfixes we are merging into master daily.
So I ...
- 21
9
votes
2
answers
689
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 ...
- 111
-2
votes
1
answer
6k
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?
- 127
-2
votes
1
answer
231
views
How to handle dependencies 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. ...
- 127
-1
votes
2
answers
124
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 ...
- 131
1
vote
2
answers
155
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 ...
- 7,099
0
votes
2
answers
967
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 ...
- 133
7
votes
2
answers
1k
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 ...
- 197
1
vote
1
answer
128
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 ...
- 369
3
votes
3
answers
1k
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 ...
- 167
-2
votes
2
answers
3k
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 ...
- 113
2
votes
1
answer
566
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 ...
- 81
0
votes
3
answers
2k
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 ...
- 1,071
39
votes
6
answers
11k
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,529
-1
votes
3
answers
1k
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, ...
- 125
5
votes
6
answers
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) ...
- 233
4
votes
1
answer
146
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 ~...
- 187
55
votes
5
answers
23k
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 ...
- 1,071
4
votes
4
answers
3k
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 ...
- 143
1
vote
1
answer
691
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 ...
- 119
2
votes
1
answer
583
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 ...
- 61
0
votes
2
answers
306
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,...
- 317
4
votes
3
answers
431
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. ...
- 127
0
votes
2
answers
211
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 ...
- 223
-1
votes
1
answer
2k
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 ...
4
votes
4
answers
3k
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 ...
- 173
0
votes
0
answers
345
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 (...
- 185
8
votes
5
answers
6k
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 ...
- 219
8
votes
5
answers
5k
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
1
answer
540
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 ...
- 11
1
vote
3
answers
101
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-...
- 111
-4
votes
1
answer
233
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 ...
