What happens here is that the remote has received updates, and git-flow requires that develop and origin/develop to be at the same commit before merging back the feature. This is to prevent bad conflicts when publishing the branch. To solve this, you need to: sync your local develop with origin: checkout develop, and pull from … Read more
The simplest way to get some commits from one branch to another is cherry-picking. Assuming that your fix in master has the commit hash HASH and you want to take that hotfix into your devel branch, do a git checkout devel followed by a git cherry-pick HASH. That’s it. If you want to take all … Read more
I have the same problem here, you can still use Git-Flow From the menu: “Repository-> Git flow /HG flow -> Next action” Using the hotkey: “⌥+⌘+F. But still not able to get the button back… :/ On the download page the button is also gone: https://www.sourcetreeapp.com/ Alternative you can download the previous version here: http://downloads.atlassian.com/software/sourcetree/SourceTree_2.1.dmg … Read more
The simplest way to explain Travis CI is that it runs your program’s tests every time you commit to GitHub (this can be configured in many ways, and you can always disable builds on some branches). The point of this is that you can often discover very quickly if your commit broke something, and fix … Read more
You can create a sub-feature branch via git flow feature start PROJ-511 feature/PROJ-500 But you cannot use the GitFlow tool to merge the branch back into the main feature branch because if you do git flow feature finish PROJ-511 the feature will be merged into develop. Ergo sub-features are not supported, you need to do … Read more
In the git-flow model, your “latest released” version actually maps to the master, while your “preview release” maps to a git-flow release branch. It is forked from develop and finally merged into master when the actual release happens. Then this will become your “latest release” and you will usually fix only bugs for that release, … Read more
You can do what @Peter said from the command line too! Those commands remove all the sections of the git config file related to gitflow. git config –remove-section “gitflow.path” git config –remove-section “gitflow.prefix” git config –remove-section “gitflow.branch” Then you can re-init gitflow as usual. git flow init
It seems that there is a concept of a “support” branch in git flow. This is used to add a hotfix to an earlier release. This thread has more information, with these examples: git checkout 6.0 git checkout -b support/6.x git checkout -b hotfix/6.0.1 … make your fix, then: git checkout support/6.x git merge hotfix/6.0.1 … Read more
Well, basically it is a matter of preference, but I prefer the version with the v, as Semver does it that way and I try to follow that specification as close as possible to get a sane versioning. It also makes filtering for those Tags easier, as you can press v and then the TAB-key … Read more
As discussed in GitMinutes episode 17, by Nicholas Zakas in his article on “GitHub workflows inside of a company”: Git-flow is a process for managing changes in Git that was created by Vincent Driessen and accompanied by some Git extensions for managing that flow. The general idea behind git-flow is to have several separate branches … Read more