We use what is called the unstable trunk development method. This was the development methodology that the creators of Subversion had in mind when they created Subversion. It’s simple and easy to implement. You do all of your development on trunk. Thus called the unstable trunk. When you get close to a release, you make …
Alternatively make develop the default branch that everyone sees when visiting the project. The downside is that anyone who clones it will get an unstable branch by default but all pull requests will go to the develop branch by default too.
Something important to realize is Git branches are nothing more than a label pointing to a commit. Branching in Git is literally branching. Here’s what a repository looks like if feature branched off master when master was a commit B. A – B – C – F – H [master] \ D – E – …
These steps should do the trick: Get the sha’s needed: git log <sha1> is the commit right before the merge <sha2> is the last commit on develop before you started working on the feature git checkout develop git checkout -b feature/<feature-name> git reset <sha1> –hard git checkout develop git reset <sha2> –hard Push your feature …
As you mentioned, a Pull Request has only one target branch, so you won’t be able to push the hotfix to both master and develop by merging one Pull Request. I’m also surprised you mention your step #4 – merging the hotfix branch to both master and develop and push upstream – is one action. …
we are having a similar setup except we have more than 300 dedicated developers, we have exactly what you described several revision we need to deliver to different customers. We have divided it so we have an initial ref like refs/heads/platformX.Y/ then we build on that So depending on what you need to do you …
Looking at the source it seems that the remote feature branch is deleted only if you call git flow feature finish with -F. However, this fetches the remote before finishing the feature. From the docs: -F fetch from $ORIGIN before performing finish Otherwise you can delete the remote branch manually with: git push origin :feature/new
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 …
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 …