Hello this is my git workflow. I'm trying to create by using Sourcetree a new hotfix. Unfortunately I get this error: There is an existing hotfix branch (issue-#001). Finish that one first. I ...

We are using Gitflow for our git branch workflow (through TFS). When a release is successful we do the following Pull request from release to master Pull request from release to develop Step 1 ...

Using semantic-release in our Github workflows. They are setup like this: [ {name: 'main', prerelease: false}, {name: 'staging', prerelease: true}, {name: 'development', prerelease: true} ] Pus...

I am currently working on a workflow for my team. A suggestion we received was to use the GitFlow scheme. This scheme can be put on a chart as follow: However, I have one question about how to man...

My environment in local: Git connecting with Bitbucket Sourcetree with git-flow Steps I create a feature x in Sourcetree then I add the code. I do a commit including the option to create a pu...

I am using the Git GUI called 'Souretree' by Atlassian and in particular the 'Gitflow' module to manage various branches. I just created a 'release' branch that I don't want to merge back into eit...

New to git and trying to learn GitFlow. With GitFlow, every so often you cut a release branch off of the develop branch, so that you can isolate a subset of new changes and deploy them to some stag...

I am just about to merge my release branch into master with an on-premises Azure DevOps environment. When I go for completing the Pull Request I am given four merge types options: Merge (no fast-f...

I am currently using git flow with sourcetree. Work is agreed for the sprint and I create branches off develop to commit code into. I merge the feature branches into develop, then at the end of spr...

I'm completely confused about what mine vs theirs means. In this specific case, I've got a feature branch where I just squashed about 80 commits via rebase -i and am merging this back into develop....

I'm using the git flow tools and I've gotten myself in a bit of problem. My git branches have diverged. I've read master branch and 'origin/master' have diverged, how to 'undiverge'...

Are there any GUI frontends for Git with git-flow support? Our team uses Eclipse IDE on Windows and Linux. Managed to gradually infect them with git-svn, now looking for the next steps to harness...

I just tried to install git-flow, however, it does not seem to be integrated properly with git, what can I do to integrate gitflow with git? is there a way I can do this manually? Thank you, Jeffr...

Let’s say we have the following situation in Git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed: echo "On Master" >...

I am trying to apply git-flow for a project with multiple websites that share a same code base. I currently use many feature branches, one develop branch, one support branch, and MANY production b...

I used git flow feature finish to finish a feature branch. I use the AVH fork of git-flow, which deletes the remote feature branch - but the Bitbucket pull request is still open. How should I close...

I'm using oh-my-zsh and attempting to enable git-flow-completion. I'm following the instructions here to install it as a plugin. I cloned the plugin files as instructed: git clone https://github....

We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don't quite use the normal Gitflow workflow. I understand that ...

I am using git-flow to manage a project. I am getting the following message when issuing git flow release finish foo: fatal: no tag message? Tagging failed. Please run finish again to retry. ...

I have two branches dev & master. I am using bitbucket. I need to cherrypick some of the commit from dev branch. Then need to create pull request for the master branch. As my dev environment ha...

Our development team has been using the GitFlow branching strategy and it has been great ! Recently we recruited a couple testers to improve our software quality. The idea is that every feature sh...

I have recently read about the github flow. I am using gitflow as of now and I see that Github flow looks very interesting because it is not as heavy in terms of workflow as gitflow. What I don't ...

I'm using GitFlow in my git repository, so I have a master, develop and (temporary) release branch. Workflow I create a new branch from develop (e.g. fix/fix-the-bug) I squash my fix into meanin...

Question: How do you handle feature branches for maven multi project builds? Jenkins builds and deploys these branches to keep build overhead on developers to a minimum but develop and feature bra...

I'm using git / hub with github following a gitflow workflow in my project and I'm wondering if there's a simple way to avoid entering github to merge and close my pull requests. The worflow I'm ...