Questions tagged [git-flow]
The git-flow workflow defines a strict branching model designed around a project release. It provides a robust framework for managing larger projects. Use this tag for help with applying git-flow to your workflow, or for help with the supporting scripts (either the original scripts or the AVH Edition).
git-flow
1,101 questions
Best practices
1
vote
13
replies
139
views
Why we need a master branch in Git-flow?
In git-flow, each release branch is buried into master when released. The alleged purpose for that is to have some branch which head reflects the latest released code. But I don't see how that is a ...
- 682
6
votes
1
answer
223
views
How to manage Entity Framework migrations and databases when using Git version control?
We are planning to use a Gitflow workflow and a shared test database. We currently use EF 6.5.1 and have automatic migrations disabled.
Problem: if a developer runs ...
- 163
-3
votes
1
answer
163
views
How can I dissect a shell 1-liner workflow to understand what this git command does? [closed]
I am updating an existing pipeline on GitLab that creates an automatic cascade on GitLab.
When a merge request is merged, the pipeline is triggered to perform an automatic commit to a lower branch (if ...
- 131
0
votes
0
answers
197
views
How to override default GitVersion behavior to bump version using both tags and commit messages (GitFlow mode)
I'm using GitVersion with the default GitFlow workflow (workflow: GitFlow/v1), and I want to leverage both:
Use annotated Git tags (e.g. v1.2.0) to create stable releases
Use +semver: in commit ...
- 653
0
votes
1
answer
83
views
Creating a release picking a few commits from the Main branch
I have a trunk based branching workflow.
What I want to do is to create a release branch where I can pick a few commits (Not all commits) from the main branch such that it should keep the version ...
- 423
0
votes
1
answer
369
views
How to manage multiple version at the same time in TBD?
Our team is struggling with frequent merge conflicts due to managing multiple versions simultaneously. We're looking for a workflow that reduces these conflicts.
Our Environments:
We maintain multiple ...
- 73
1
vote
0
answers
349
views
How to Configure GitVersion for Stable Main Versions and Pre-Release Feature Tags with Patch Increments?
I'm trying to set up GitVersion (dotnet-gitversion tool version 6.1) so that:
The main branch always produces stable versions without any pre-release tags.
All branches, including feature branches, ...
-1
votes
2
answers
118
views
branching strategy with gitflow
I have some trouble understanding how git flow work.
especially when I use bitbucket and sourcetree to see if the branching is correct.
I tried its not.
here are the commands I issued:
...
- 1
1
vote
1
answer
70
views
git branching model and version to be tested
I am willing to addopt the git branching model described here (which led to git-flow branching model).
From my understanding:
A release branch is created from the develop branch when features and ...
- 11
0
votes
1
answer
37
views
The file is not visible even though I changed the branch using Gitflow
I cloned it again and set up Gitflow to change the branch from main to development, but the file is not visible.
After deleting the file, I cloned it again and set up Gitflow again, but it was the ...
- 1
1
vote
1
answer
78
views
Why is Gitflow release operation doing so many actions in Bitbucket
I learned that release action in GitFlow is merely a merge develop branch (latest update) to the release/XXX branch with a TAG on it.
I would like to do simply as following:
...
- 11
0
votes
1
answer
389
views
How to manage hotfixes across main and dev branches in Git
I have two branches: main for the old release and dev for the latest release. I need to manage hotfixes effectively across these branches. Specifically, I need to:
Merge features from dev to main ...
- 65
1
vote
2
answers
262
views
Azure DevOps - Traceability of ALL Work Items contained in a given release
I need to have full traceability between PRs and Releases -- I want to be able to see which work items were implemented in which release.
Azure DevOps apparently has a limit of 100 commits - which ...
- 438
-1
votes
1
answer
141
views
How to create a minor release with only some commits
I'm using the standard git flow.
In some cases I need to create a minor release choosing a subset of all the commits done in develop branch.
Let's say I closed my last release and merged it back to ...
- 338
-2
votes
1
answer
73
views
Making better version control system [closed]
I studying version control in Git. When I draw about Git Flow, confused about them. I need your advice.
I Make project "CamViewer" and make 'Main' Branch. And create new branch 'Develop' ...
user20320225
0
votes
1
answer
98
views
How to handle conflicts when merging one shared branch into another
I have come across a problem with our merging process in GIT and hope somebody can help me resolve it.
Full disclaimer: I know little to nothing about GIT so apologies in advance.
Long story short we ...
- 851
0
votes
0
answers
358
views
What is the correct process for merging hotfix changes into multiple release branches (ie: dev/staging)?
I'm wondering what is the correct way of getting a hotfix into various main release branches which ensures Git history for these branches are more aligned and Git history is consistent?
I have the ...
- 16.9k
0
votes
0
answers
81
views
GitFlow for feature split in sub branches
Another GitFlow question for you :)
Can you help me understand the right procedure to apply in the case below?
I want to start the development of a new big FeatureA starting from the develop branch.
...
- 53
3
votes
1
answer
484
views
Bitpucket Pipeline Configuration for Gitflow Branching Model
I'm following this link for the Gitflow branching model:
In this diagram, commits flow as follows:
Scenario-1: Feature -> Dev -> Release -> Master
Scenario-2: Hotfix -> Master and ...
- 2,504
2
votes
1
answer
91
views
Git Flow: Managing Main-Develop Version Discrepancy After Feature Merges
* cde53d9 (origin/main, main) Merge branch 'develop'
|\
| * 7d94faa (HEAD -> develop) Merge branch 'feature/road-view' into develop
After merging the ...
- 890
0
votes
2
answers
925
views
How to handle PRs when using Gitflow?
How many PR reviews should I be doing when running Gitflow? I have a feature branch with quite a few changes on it. I've PR'd it with reviews and merged into the develop branch. There may be like one ...
- 125
0
votes
1
answer
410
views
Addressing the hotfix, bugfix, and versioning aspects for GitFlow?
I'm using GitFlow to manage an application that includes 3 features and 2 releases.
Release 1.0.0 will include Feature 1, while Release 2.0.0 will include Feature 2 and Feature 3.
so here are the ...
user22969480
1
vote
1
answer
55
views
Need to have 2 active release branches in git-flow
We have a release branch which has already passed the testing stage and it's ready to be deployed in production.
But we are facing a big freeze period so we won't.
We also want to create a new release ...
- 71
4
votes
1
answer
2k
views
Constant merge issues from release branch to master and back to development
We have really weird issues with our merge strategies. We are following git flow branching strategies with master, development, feature and release branches. The one thing we haven't done all the time ...
- 1,798
1
vote
0
answers
741
views
Why we shouldn't merge main branch to develop branch in gitflow?
In gitflow It suggests we should merge release/0.0.1 to the main branch and then merge to the develop branch.
Once the release is ready to ship, it will get merged it into main and develop, then the ...
- 1,116
0
votes
0
answers
3k
views
Github action to extract current version from package.json, increment the version and create the branch before running `npm version`
I'm currently writing an example set of workflows for a generic NPM based application. I'm currently working on creating a release branch which branches of Dev. This can be called via ...
- 485
0
votes
1
answer
621
views
GitFlow - Master or Develop branch which to mirror
I'm new to GitFlow. Should develop branch be a mirror of master branch all the time or the other way around ?
As a background of ...
- 567
1
vote
1
answer
150
views
Make long lived release branch sync with master whilst keeping commits
At my work we use something resembling gitflow. We had a release branch with several features already merged, and I needed to add a feature to that release that depended on those features, therefore I ...
- 3,518
0
votes
1
answer
649
views
Git merge error caused by visual studio after checking out to master branch
Im pretty new to git and i still couldn't figure out the best approach, when it comes to flow of git.
Im using this flow, but it seems to cause errors. Could you fix it for me?
...
- 47
3
votes
2
answers
5k
views
Is it possible to merge hotfix branch to both develop and main branch in Github?
I'm now using gitflow strategy and github as a remote repository.
Recently I encountered a problem of merging hotfix PRs into both develop and main branch.
It seems the Github supports only one target ...
- 65
0
votes
1
answer
781
views
Trigger a GitHub Action run when complete PR require approvals
I want to trigger tests through Github Actions when a PR completes code review. I have set Required number of approvals before merging to 2, but I couldn't find any relevant events in the ...
- 876
1
vote
0
answers
315
views
Gitflow merge strategy, merge commit, squash or rebase?
We use the gitflow branching strategy at work and I'm curious as to what would be the best merge strategy when merging pull requests?
Up until now we have exclusively used the typical merge commit but ...
- 4,186
0
votes
2
answers
147
views
What branching model should I use for multiple specialized releases?
I'm working with a team on a project that has multiple releases for special customers ( They get custom features, therefore need their own release ) and I'm not sure what branching model to use?
I ...
1
vote
0
answers
767
views
How can I get ArgoCD to deploy an application for each feature branch for any git provider?
I have installed ArgoCD v2.6.5 using the Helm chart here, version 5.27.0.
Our team uses feature/ branches to perform independent ...
- 524
0
votes
1
answer
207
views
Get changes from featurebranch checkout from preprod in to develop branch
In my repos i have
branchFeatureA checkout from preprod. Then all commit of branchFeatureA ...
- 21
0
votes
1
answer
122
views
Git Release flow: deploying features not in commit sequence
I am starting a new project and would like to use Release Flow http://releaseflow.org/
I would have a "main" (master/production) branch, which will represent latest project state. To make a ...
- 33
1
vote
2
answers
1k
views
GitFlow - How can I achieve continuous deployment for some parts of a pull request/deployment even when others don't past testing?
We have 3 environments:
Staging - where all developer pull requests get merged for quality assurance testing
Release - After quality assurance testing, staging pull requests are merged into the ...
- 67
0
votes
1
answer
109
views
Deploying test and production branches of a git repository on two separate subdomains using a script
I am currently working on a Linux bash script to deploy a specified branch of my git project on my website : the develop branch to a test subdomain and the main branch to the main domain.
To do so, I ...
- 1
1
vote
1
answer
266
views
Keeping a semi-linear git history where some feature branches cannot be rebased?
I have the following situation:
The teams want to keep a linear git history so they are enforcing rebase and squash.
We have some feature branches with a long lifetime (months even) with multiple ...
0
votes
1
answer
1k
views
gitflow branching strategy with bitbucket
I am trying to implement gitflow branching strategy and trying to understand how to resolve the problem I am facing. if you think there is a better branching strategy which could solve this issue ...
- 13.1k
-2
votes
1
answer
6k
views
how to fix "Another git process seems to be running in this repository" [duplicate]
start project by git flow
and in process bugfix not commit finish process see error to other order git:
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'...
1
vote
0
answers
149
views
How do I manage PR and CI pipelines in Git Flow strategy?
If I deploy to prod from the latest release branch forked from dev how can I integrate PR to review code?
Also, if I would like to run a test integration pipeline automatically when a pull request is ...
- 27
2
votes
1
answer
226
views
Gitflow, Squash merged and AzDO branch compare
We are currently using Git flow as a branching strategy, and we are squashing our feature branches into develop. We are also squashing our release branches into <...
1
vote
0
answers
207
views
Maven gitflow fails with: release: fatal: refusing to merge unrelated histories
On github actions, am trying to release a version but it fails with error:
release: fatal: refusing to merge unrelated histories
Here is the command run:
...
0
votes
0
answers
479
views
Why are all my commits in SourceTree in one straight line?
I recently started using Git and SourceTree for a project I'm working on. I have worked with Git a little bit before in a previous job, in which case I used Fork. Someone else then set everything up ...
- 131
1
vote
1
answer
931
views
Multiple Initial Branches in Azure DevOps Repositories
I was wondering if it is possible to make Azure DevOps to automatically create both master and develop branches upon creating a ...
- 11
1
vote
1
answer
881
views
Why does a new git branch have the old history?
I'm studying design patterns in python and I'm doing version control in git.
The first thing I did was create a branch called "Creational Patterns", in which I made a commit for each one (...
- 1,018
1
vote
1
answer
2k
views
git flow feature finish
Hi I am new and I am not sure if this is a valid question or if the answer is a simple "it's the same"
I am using git flow for my java project and I have been using
...
- 55
0
votes
0
answers
59
views
How should I merge into main branch in Git with this structure?
In my team, we have a repository that has two branches to deploy a website: Main and Develop
Main: This one, is connected with the server and this branch only ...
- 33
1
vote
0
answers
513
views
gitflow-maven-plugin with protected master branch: create PR
My master branch at github is protected, changes can only be made via Pull-Requests. With gitflow-maven-plugin gitflow:release I'...
- 1,312