feature-branch

How can I move some commits of a feature from an existing branch into a feature branch, and effectively remove them from the current branch - as if the feature was developed in a separate feature branch? Background: the branch develop contains commits to two features A (say, 50 commits) and B (10 commits) wildly mixed, since they originally should have been in the same release. Now we are delaying feature B. Thus, we want to have only feature A in the develop branch, and a new featureB branch that contains the commits of A or A and B, such that if we merge both branches, we get the current

If developers were to work on different branches for different features I understand that they can give a QA build from the feature branch and once it is tested it can be merged with "develop". But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? VonC But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? That would be by: setting up an integration branch, reset to the latest

I am currently trying to set up TeamCity to build all the branches which are not my team's main branches . I have had trouble getting this to work, and have only gotten this to function with the default branch. Our repository has the following branches: master, Daily-build, Branch-Alex, and others with similar names. I pretty much want this build configuration to run on pushes that do not include master. Here are some pictures of my configuration: VCS Root: Trigger Settings: Current Build Config: TL:DR - Is there a better tutorial for setting up feature branch building in team city? Bonus

What would be the preferred way to achieve the following workflow with either Git or Subversion (I have more interest in the Git version, but comparison will definitely be useful): Let's say we had a major release of the product recently and there is a specific polisihin branch called release-2.0.x . The development then continued and several feature branches were merged into the master/trunk (they will later become the part of the upcoming release-2.1.x ). Now, at some point another feature (namely, critical-feature ) was developed and merged back to master/trunk . We realize that this

After reading this article, it makes sense to rebase to gather changes from the main branch on to my feature branch: Git workflow and rebase vs merge questions clone the remote repo git checkout -b my_new_feature ..work and commit some stuff git rebase master ..work and commit some stuff git rebase master ..finish the feature git checkout master git merge my_new_feature This works great if the feature branch is local to my machine and I can rewrite history as I please. But what if I collaborate with someone else on the feature branch. How do we get the latest changes from the main branch into