How can I create a second hotfix branch in Sourcetree when one already exists? Whenever I try to it tells me to finish my current hotfix first. Any way to have multiple hotfix branches?

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 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'm trying to understand GitLab's suggested flow on http://docs.gitlab.com/ee/workflow/gitlab_flow.html. But, I'm not really sure about this statement: If you need to cherry-pick a commit with a...

I have a simple Heroku deployment pipeline (review apps -> development -> staging -> production). If I push something to master then it will trigger the CI (codeship) and if the tests ran successfu...

If you try to follow the git-flow branching model, documented here and with tools here, how should you handle this situation: You have made a 1.0 release and a 2.0 release. Then you need to make a...

I'm trying see whether it's possible to remotely update an app on a users phones without downloading an .apk file. (It's an information gathering request from my "boss". He thinks it's possible on ...

What is the best practice to deal with recurring merge conflicts that are caused by preparing maven releases in a git flow environment with multiple hotfix branches? (See http://nvie.com/posts/a-s...

What's the most reliable method of ascertaining what Tridion Hotfixes have been applied to a system (other than proper previous release documentation)? Specifically I'd like to know for SDL Tridio...

I just recently started using git flow and there's something I don't quite understand. First, I never do anything directly on develop. If I do something I either use a start a hotfix or feature. M...

I am in need of help setting up a TFS branching structure. The current scenario is as follows, our application is a SaaS, and I believe we need multiple "Release" branches simultaneously. Going t...

Today I had to reinstall. I used to have some hotfixes installed for VS2008 but no longer have them and can't remember why they were necessary. I'm expecting any security-related hotfixes to come t...

I have some issues with the Riched20.dll file which is used by my application, this problem is fixed applying the KB884047 hotfix, in order to avoid problems with old windows versions, I want to de...

With the regularity of VS2010 crashes increasing as I use it, I was looking for a list of hotfixes. This blog post says there is no official list, so let's make one (RTM only please). Or is t...

As you might be aware an update to visual studio 2005 was auto updated on most machines last week. This update included a new version of the visual c runtime library. As a result any binaries built...

When you are somewhere between version 1 and version 2, what do you do to maintain your software? The terms Patch, Hotfix, Maintenance Release, Service Pack, and others are all blurry from my poin...