Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

134 questions
0
votes
0 answers

New to gitlab Master and Develop branch & feature stories from develop branch,

Following is the scenario and I would like to understand and possibly write steps for team members - "how to" Scenario: As in any real world scenario we have Master. Story branches are created and worked upon and pushed to Master. This is for…
Nav D
  • 1
  • 1
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
  • 2,787
  • 4
  • 27
  • 56
0
votes
1 answer

git rebase --onto with EGit, no support?

I have a typical use case working with feature branches and Git, as follows: I want to rebase my feature branch onto master, without applying the commits from the branch "1.24", I have managed to do this from the command line specifying all the…
lqbweb
  • 1,397
  • 1
  • 16
  • 30
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
  • 496
  • 3
  • 16
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,388
  • 10
  • 56
  • 109
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,628
  • 4
  • 23
  • 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
  • 38,622
  • 28
  • 141
  • 213
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
  • 30,911
  • 13
  • 94
  • 171
-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
  • 63
  • 6
-1
votes
1 answer

Two feature branches. Where to put modifcations?

I'm using typical git branche flow. The main branch is develop and feature branches are created when needed. Let's say, that I created feature-test branch. Next I created and tested one Class Test. Finally the branch was merged into develop. Now…
Mati
  • 465
  • 3
  • 15
-1
votes
1 answer

Creating git feature branch using teamcity

I want to create git feature branch using teamcity and also merge it to dev using teamcity. Is it possible and how?
IAmAProgrammer
  • 11
  • 8
-1
votes
1 answer

Git : Shall I merge the source branch into the feature branch?

At my office we are using git and doing some code review. Coming the time to review my colleague ask me to merge the source branch (master) into my feature branch to be able to see the differences and do the review. I did not really agree because in…
La Chamelle
  • 2,797
  • 3
  • 33
  • 54
-1
votes
1 answer

How do I create optional feature branches?

I have forked an open source project on github (https://github.com/alberthendriks/peatio/) and I want to offer functionality for the community. Peatio is a currency exchange that by default only supports CNY and BTC. Now, there are instructions to…
Albert Hendriks
  • 1,644
  • 2
  • 20
  • 37
1 2 3
…
8
9