Questions tagged [git-flow]

1

votes
2

answer
22

Views

Git branching strategy issue

Currently we are using a GitFlow approach to our branching strategy. However we came across the following scenario. We created a release branch. There were a couple of bugs that needed a fix on the release branch. In the meantime since the development continued on the develop branch there were addit...
igalbenardete
1

votes
1

answer
44

Views

Create a hotfix branch or a feature branch in gitflow model

I'm using this model in my team: Today my project stats is following: The stable version is running in production using master branch We developed new functionalities that need to be tested before production, so we have a release branch be testing under SIT Environment. This new functionalities jus...
RonaldoLanhellas
1

votes
0

answer
133

Views

Do I have to re-init git-flow repository after every clone?

I have a repository where I'm using git flow. I initialized the git flow, but when I clone it I need to run git flow init again. Is there an automated way of doing this!? At initialization I have to setup: develop, production branches features, releases and bugfix prefix version prefix. I know this...
geckos
1

votes
0

answer
48

Views

Git flow - skipping releases

I've recently started using Git Flow as a source control methodology and was wondering how you'd deal with a scenario where a release is no longer required and for example, the client wants to skip a release, wanting to scrap all recent work and want new features on a new release.
Mr Pablo
1

votes
0

answer
30

Views

git-flow stopped working on windows until echo statement added - why?

I have happily been using git-flow on windows until it stopped working. I'm not exactly sure why. The error I get is the following: C:\Git\XXXXX>git flow init help C:\Program Files\Git\usr\bin\git-flow: line 116: /gitflow-shFlags: No such file or directory Where XXXXX is just any cloned repository...
snowpuma
1

votes
1

answer
655

Views

How to deal with a bugfix in GitFlow (or other process) once a release is ready to ship and merged into develop & master

From https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow : Once the release is ready to ship, it will get merged it into master and develop, then the release branch will be deleted Now that the merge is done : let's say we're now facing instability in production suddenly (ho...
NicolasW
1

votes
2

answer
125

Views

Separate environment for hotfixes branch?

Currently we moved to gitflow branching model. We defined 2 environments for QA: testing, staging. Code from develop branch is deployed to testing environment, and code from /release branch goes to staging environment. Now we have to apply a hotfix. So we created a separate hotfix branch from master...
DmitriBodiu
1

votes
0

answer
229

Views

What branches should SNAPSHOT versions be present in?

According to Gitflow, where should POMs with -SNAPSHOT suffixes be placed? From what I've understood, develop should always contain a SNAPSHOT version so that we can build the latest SNAPSHOT from each feature that is pushed to that branch. When we then want to release, we create a release branch fr...
hochas
1

votes
1

answer
153

Views

develop and master branches not visible remotely on VSTS

The first picture displays that I have only one feature branch on VSTS: The second picture displays that I have develop and master branches as well in visual studio locally: There were master and develop branches on remote before, but seems to disappear suddenly. My commit history does not show any...
Azmeena
1

votes
1

answer
74

Views

pull request hotfix to prod and dev

Working with github and pull requests flow. In case of a bug in production, i open a hotfix/branch in order to resolve the issue, compile, test, and opening a pull request back to master branch (the production branch in our case). Is there an option to let this pull request to automatically merged a...
Mickey Hovel
1

votes
0

answer
48

Views

Can merging master into develop in GitFlow ever cause conflict?

I am wondering if using gitflow and merging master into develop will ever cause a conflict. I intend to make this 'git merge master' into develop command an automatic, non-interactive process, so if there is a conflict, it will fail since it would need human interaction. I am using GitFlow and chan...
jbu
1

votes
1

answer
161

Views

Fixing merge conflicts with git flow

I'm using the following flow: There's master, test and feature branches. Feature branches are branched from master. Pull requests are made from feature branches to test and then (when approved) from the feature branch to master. Whenever I make pull request from feature to test, there's a chance a m...
Cake
1

votes
1

answer
458

Views

How to merge tag to master branch during release by maven-release-plugin?

I have configured maven-release-plugin in the following way: org.apache.maven.plugins maven-release-plugin [email protected]{project.version} true false Let's use in example that project has version: 1.3.10-SNAPSHOT I use following command for release (in develop branch; vcs is git): mvn -B initialize release:clea...
bmilczarek
1

votes
0

answer
52

Views

git push “src refspec refs/heads/feature/a-feature-branch does not match any”

After a git flow command for finishing a feature branch git flow feature finish a-feature-branch, the git push -v command always gives me the following error msg, no matter the branch I am. Pushing to [email protected]:/repo/repo.git error: src refspec refs/heads/feature/a-feature-branch does not match...
aschmid
1

votes
0

answer
142

Views

Git Flow and Continuous Integration/Continuous Delivery

I'm trying to get my head around what steps are involved in using Git flow with a CI/CD pipeline (nb delivery not deployment) I figured I could have a Jenkins job which is triggered by pushes to the development branch. And another which is triggered when the release branch is merged into the master...
PDStat
1

votes
1

answer
52

Views

Error occurs when initializing git flow in mac

I've been practicing git flow, so I installed git-flow-avh by Homebrew. But error occurs when I try to initialize git flow by typing git flow init in terminal on my MacBook. The error message is like in the photo below. I deleted Sourcetree app and typed git flow init because the one of the errors m...
yjp
1

votes
1

answer
28

Views

git flow merge down/left continously

Git flow ensures the following way that changes to master and release eventually end up in develop: hotfixes branch from master and merge back to develop. If there is an active release branch it merges there and only propagates to develop once release is merged to master and develop. changes to rele...
Chris
1

votes
0

answer
99

Views

Git Feature Branch Merge to Staging from Develop Issues

Currently, we have this workflow: We create feature branches based on the develop branch (develop is based on the master branch) We open PRs with base develop and after code review, we merge into develop We want ONLY the approved feature branches to be moved next to staging branch which is exactly a...
Islam Wazery
1

votes
1

answer
53

Views

Personalise jgitflow maven plugin

i started using jgitflow in a java project, and i want to achieve something like below: external.atlassian.jgitflow jgitflow-maven-plugin 1.0-m5.1 true execution1 hotfix-start release-start feature-start feature-finish true execution2 hotfix-finish release-finish false when i start a new hotfix i sh...
Denoxus
1

votes
0

answer
20

Views

Unable to Clone Gitflow

I've been unable to clone Gitflow. I've used: git clone --recursive https://github.com/nvie/gitflow.git to no avail. This is the same for both https and ssh. I do have a valid ssh key and have been using it without issue on other repos. It seems to have a problem with the recursive modules. This...
onefootswill
1

votes
0

answer
48

Views

Git Flow: best approach for a hotfix for an older version being merged after a new release

When Vincent Driessen explains Git Flow he says a hotfix branch must be merged back into the master and develop branches, with the exception that if a release branch exists, the hotfix gets merged back into the release branch instead of the develop branch. This scenario considers the release is fini...
Flávio Araki
1

votes
0

answer
25

Views

Forcing merge commits with jgitflow-gradle-plugin

Can I make jgitflow-gradle-plugin to create always a merge commit when I complete a feature (i.e. when I call task featureFinish)? I would like to avoid fast-forward merge of a feature branch to the develop branch. When using Maven plugin jgitflow-maven-plugin, I can prevent fast-forward merging by...
Cimlman
1

votes
0

answer
196

Views

Azure DevOps Release pipeline for create-react-app and GitFlow?

We have a creat-react-app application, which includes a couple of variables that are different (react) build time, depending on where the build will be deployed. For example, we need to specify build time which URL will be used, e.g. https://app-stage.company.com for a release-x.y.z build vs. https:...
Kjell Rilbe
1

votes
0

answer
12

Views

How do I open a pull request containing only the first few commits of the source branch?

I have a TFS git repo which more or less follows gitflow. Three feature branches were reviewed and merged into develop then it turned out that the feature which was merged the latest requires additional thinking. None of them were merged into master yet. I'd like to open a pull request into master c...
sharptooth
1

votes
1

answer
55

Views

CircleCI filter pull requests

I have a Gitflow branch structure like this: master (default) develop feature/header I'm using CircleCI with the 'Only build pull requests' feature enabled. With this enabled, it will build all pull requests and always build the default branch. So the following happens: PR created from feature/heade...
Coop
1

votes
2

answer
49

Views

Git / Gitlab Flow Workflow

We have the following branches in our project: master preproduction production We use branches like feature/myfeature-123 to develop new function. If they are done, we merge those into the master. After a while, when enough features are done and successfully merged into master, we deploy our project...
Max Schindler
1

votes
1

answer
35

Views

What is the best way to implement git flow with a project with many submodules

We have build an Asp.net core micro-services project and organized the code into one super project and multiple Git submodules (each microservice is a submodule). Now we want to start using the Git Flow workflow. What is the best way to initlize the gitflow? do we need to have one git flow per subm...
Nabil Kem
1

votes
2

answer
1.1k

Views

git revert deleted files in master, keep feature working files intact

While working in a local 'myfeature' branch, I deleted some files and committed them locally. Along the way, those commits were then merged with remote origin/master. I needed to get those deleted files back, so I did a git pull for the latest on master and cut a 'hotfix' branch where I: git rever...
hybrid9
1

votes
1

answer
191

Views

Recreate a non-fast-forward merge with git rebase

Since I heard that being a lazy programmer is a virtue, I delayed the creation of my git-flow feature branch like this: * dca9fae - Merge branch 'feature/refactor' into develop |\ | * 9ca4bc3 - Delivery task | * 8b2e03f - rf up Repo DSL attributes |/ * e1ddb98 - access to self.views made private * 0...
SystematicFrank
1

votes
2

answer
389

Views

how to show the full commit message on the merged branch

I use the git-flow to develop my project I often have hundreds of commit messages on the feature branch when developing. But once merge the feature branch into develop branch, I can only get one merged commit message and lose the hundreds of commit messages. Is there any way to review the hundreds...
newBike
1

votes
1

answer
91

Views

Git Flow fetch feature branch onto staging server

Okay there are many posts similar to this but I am still a little confused. I am using Git Flow. I have a staging server with with master and develop bracnhes, currently on develop. I use bitbucket as a repo. I have a new feature/new-branch locally that I have pushed to the repo. I want to pull or f...
user24793
1

votes
1

answer
103

Views

Hotfixes and release branches

Imagine you are preparing a release, and you also have to make a hotfix. The docs say, you should merge the hotfix branch to master and develop branches. But what about the release branch? I guess I should also merge it here, right? Or should I merge the hotfix just to release and then realease back...
Pitel
1

votes
1

answer
72

Views

Feature Branch Workflow Tool

Is there an extension for git, like GitFlow but uses the Feature Branch Workflow, meaning: master feature branches pull requests to master
Gal Segal
1

votes
1

answer
61

Views

How do you selectively release a good branch and not a bad branch if the bad branch came first?

I'm working specifically within the confines of git-flow here. It's very clear to me how this would be accomplished with git generally, but git-flow is the thing I'm primarily concerned with here. Imagine this scenario: developer 1 and developer 2 are both working in parallel. developer 1 and devel...
Matt Korostoff
1

votes
1

answer
29

Views

Which branching strategy are suitable for our team

Now, we are using SVN as version control, we got tickets from customer (include new feature and bug fixing), all developers commit the changed code to trunk, and deploy all change to QA environment for testing. However, not all of tickets are go live to production, some features need more approval f...
Khoi Nguyen
1

votes
2

answer
802

Views

Git Flow GitHub pull request isn't working as expected

I've been using github for a while now where I create feature branches (locally) add commits and then push. Once pushed I perform a pull request with a 'develop' branch, once happy, merge the feature branch into the develop branch. This seems pretty much standard practice. I use git flow and this i...
Mark Kenny
1

votes
2

answer
303

Views

How to stop divergent branch warnings in Git?

I use git flow so I work on a develop branch and only push releases to master. After creating a remote (named heroku) on my Heroku account, I started pushing my local develop branch to master, mostly for verification: git push heroku develop:master Now that my app is more mature, I only push master...
Gingi
1

votes
1

answer
1.1k

Views

Jenkins Git Publisher not working with Multiple SCM plugin

I have a use case where I have a promotion which will trigger a build from the integration branch after merging from the developer branch. I would like to push the merged changes back to the remote repository on github into the integration branch. My code is built from two different git repos using...
Anand
1

votes
1

answer
51

Views

Git pushes to master

I'm working in branch feature/something. When I do git status, it says: On branch feature/something Your branch is up-to-date with 'origin/feature/something'. But when I've just done git push, it pushed all my changes in both origin/feature/something and master. Why could it happen? I thought by def...
Dmitrii Mikhailov
1

votes
1

answer
99

Views

Git branching workflow; how to reduce number of Git commands

This is not a question about workflow opinions, but rather a specific question about how I can reduce keystrokes for the workflow below. My dev team generally follows a customized branching Git workflow. Workflow code is branched from master branches have a prefix feature/, refactor/, bug/, etc... c...
Dan L

View additional questions