It seems that I can just delete the branch according to the following sources: Evan Hahn dominiksymonowicz To quote Evan: To trash a branch using git-flow , simply delete it like you’d normally delete a Git branch: git branch -D whatever/branch/you/wanna/delete Note that this does a forced delete, so anything you did on that branch … Read more
You can just use the git flow feature publish <name>this will publish your feature branch to your origin (like Bitbucket). Then you can create the pull request there and merge it into develop. After that is done, you need to manually delete the local feature branch. The only command you can not use is git … Read more
Once develop has acquired enough features for a release (or a predetermined release date is approaching), you fork a release branch off of develop. Creating this branch starts the next release cycle, so no new features can be added after this point.Only bug fixes, documentation generation, and other release-oriented tasks should go in this branch(which … Read more
While Git Flow is an excellent branching model, the questions you are asking are a symptom of a bigger problem: Git Flow is too heavy for a small team working on a consumer web product (I am making an assumption that you are working on consumer web product, feel free to ignore if you are … Read more
You do not need the git flow feature pause yak-Speedup command (feature pause doesn’t exist anyway). The command you want to use in place of git flow feature resume yak-Speedup is git flow feature checkout yak-Speedup; that will get you back on the yak-Speedup feature branch to continue development. Executing git flow displays: Try ‘git … Read more
The only safety is in learned, discerning and frequent merges. Only you understand how the code on develop and feature/xyz aligns, no one else. It is only you who can merge the two flows correctly in a discerning way. Even with the default merging strategies, which are far less dangerous than -S ours or -X … Read more
In my opinion, and bear in mind, this is just an opinion, and you will likely get different answers, you should NOT squash the commits when merging into master from the develop branch. Doing so would lose a lot of the history of the changes that have been made. For example, almost all the commits … Read more
No, it is not possible (at least not at SourceTree 1.4.1.0). It is possible however to do it manually by editing the file /.git/config in your git repository. The Git-Flow extension adds it s configuration in the following two sections, which can be freely edited. [gitflow “branch”] master = master develop = development/current [gitflow “prefix”] … Read more
Great questions and the answer really depends on how you sort your git. The branching model and gitflow in general is trying to give us some order in the chaos that commits are just after a couple of days. The image below shows you what they though makes most sense. (As far as I know … Read more
Since git-flow just wraps regular git functionality, how about simply deleting the new branch (assuming you have no changes in there you want saved)? $ git checkout master Switched to branch ‘master’ $ git branch -d feature/your-feature-name-here