Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

139 questions
0
votes
2 answers

Is possible to use multiple branch specification in TeamCity using TFS Git features?

In my project we use feature branches with TFS 2013 as source control repository and TeamCity 9.1.6 as CI server. We have plans to upgrade to TFS 2015 soon (... and cannot migrate to GIT) I know you can use multiple branch specification when you use…
Oscar Foley
  • 6,817
  • 8
  • 57
  • 90
0
votes
1 answer

Git rebasing branch

I am a bit confused by git having previously worked with svn. I have pulled from the main branch, created my feature branch, worked on it, added and committed my changes locally, pushed to remote and then submitted my branch to jenkins and all tests…
berimbolo
  • 3,319
  • 8
  • 43
  • 78
0
votes
2 answers

Pushing a feature branch remotely in hg

I cloned an hg repo and created a feature branch (via hg branch myfeature). I have staged & committed changes to it via hg add . and then subsequently hg commit -m "My new feature branch.". I would now like to push those changes (in the branch; not…
smeeb
  • 27,777
  • 57
  • 250
  • 447
0
votes
1 answer

Git workflow: How to do a rebranding

I am responsible for a customer-facing service of my company, and by the end of march we'll rebrand our company with a "big bang", so all of our products are released on that particular day with new features and the new CI. I would estimate the work…
alsdkjasdlkja
  • 1,260
  • 2
  • 14
  • 30
0
votes
1 answer

How to determine the responsible developer(s) for a Jenkins build in a Git feature branch context?

We have a typical workflow where development is done on Git feature branches. Changes on master are pulled into the feature branch and when finished, the feature branch is merged into master (which mostly works without conflicts). The feature…
Gustave
  • 3,359
  • 4
  • 31
  • 64
0
votes
0 answers

How to handle deployment of several feature branches on one environment?

The feature branching approach, described here: http://nvie.com/posts/a-successful-git-branching-model/ is great. We want to follow it. We have production, qa, staging, integration and local environments. Our project is kind of standard website,…
jkulak
  • 768
  • 1
  • 6
  • 18
0
votes
1 answer

Can we use parameter in pull url of mercurial in teamcity

Need to know whether we can use parameter in PULL changes from URL in teamcity mercurial settings. My requirement is to pass the branch name parameter on run time. It works fine if I use the parameter in Default branch settings but I need to…
sam
  • 4,594
  • 12
  • 61
  • 111
0
votes
2 answers

Git - merge feature branch on more than one branch

I have some questions about git and good practices ... The state of the git repository is: V1.0 : B.A--B.B V1.1 : / C.A--C.B / / master: A--B--C--D I have a master, and 2 versions : 1.0 and 1.1. A new feature must be…
Kevin N.
  • 3
  • 3
0
votes
0 answers

SVN: How to periodically move some changes from feature branch to trunk?

I've got a branch that I'm doing some re-factoring work on, and I'd like to periodically move some changes back to trunk. That is to say, parts of the re-factoring work can be moved / cherry-picked to trunk as they complete. Does svn support such a…
nonot1
  • 2,788
  • 4
  • 25
  • 41
0
votes
3 answers

Subversion feature branch requires changes from another feature branch

I have two feature branches: featureA and featureB. FeatureA is complete, but not merged into trunk because it's untested and we're not ready to test it yet. I'm working on featureB, and have realised that a change implemented in featureA is…
Neil Barnwell
  • 41,080
  • 29
  • 148
  • 220
0
votes
1 answer

git rebase of feature branches which have been shared

We would like to use rebasing as our standard way of 'merging' our code. We also use fairly short-lived feature branches ( less than 2 weeks) which we push to a central repository via an automated integration manager (each developer has their own…
Sam Holder
  • 32,535
  • 13
  • 101
  • 181
-1
votes
2 answers

How to "delete" history in Git feature branch

In a feature branch (cloned from master) we added some files and than deleted them. The same files where added to the master branch. When we now try to merge back the feature to the master the files in the master get deleted (my understanding is,…
golfo
  • 85
  • 5
-1
votes
1 answer

Creating a (feature) subbranch results in the error "fatal: cannot lock ref 'refs/heads/feature/FeatureName': 'refs/heads/feature' exists"

I was trying to create a feature sub-branch, feature/featureName. There was some confusion amongst my team as some of us are using SourceTree and some of us are using Git Bash. In SourceTree, the subbranches get listed under feature, and we assumed…
KamielDev
  • 481
  • 3
  • 13
-1
votes
2 answers

Feature branch got change after merging it to Master

I had a feature branch and that I needed to merge into master so I created a pull request through github and merge it. I was expecting that all changes in feature brach that were different from master will overwrite that particular file in master…
Manish
  • 1,274
  • 3
  • 22
  • 59
-1
votes
1 answer

Git: Taking pull request from another feature branch

From the git master branch, I created a new feature branch feature_001. I created one more feature branch from master, feature_002. After finishing, I am trying to pull feature_001 changes in feature_002 also. How can I achieve this in git?
Prashant Saxena
  • 73
  • 1
  • 9
1 2 3
…
9
10