Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

134 questions
0
votes
0 answers

How can I merge the deltas of a feature branch to a legacy release branch

(Been away from git for quite a while and though there are similar questions here most seem to gloss over this part... which probably means it should be obvious... sorry...) Scenario: So I have a feature that was developed on it's own branch,…
Wizbit
  • 321
  • 3
  • 12
0
votes
1 answer

The team I work with doesn't accept the fact that master branch should be merged into develop

the team I work with doesn't accept the fact that the master branch should be merged into develop in order to align develop with master's hot-fixes/bug-fixes. They are scared that somehow when they merge master (our stable production branch) into…
tonix
  • 5,862
  • 10
  • 61
  • 119
0
votes
1 answer

Partial deployment using VSTS builds - source control strategy

I am building a VSTS build pipeline for continues integration and deployment of a MVC web project. My client wants 0 down time in case of continues deployment so we have considered restructuring the source control strategy and split the single code…
Rupendra
  • 548
  • 2
  • 10
  • 35
0
votes
1 answer

Git conflict while merging a feature branch after keeping it up to date

The solution for "Keep feature branch up to date" with git is, to merge the master into the feature branch from time to time, for example if a there is a change implemented in the master branch which is needed by the feature branch, correct? I have…
user3507003
  • 319
  • 4
  • 12
0
votes
1 answer

tosca and git feature branching

For a customer I'm testing with Tosca. In the recent past I worked with Cucumber for Java and SpecFlow for C# to test automate my work. For Cucumber and SpecFlow I'd like to work with feature branching (for each user story) and PR (Pull Requests)…
Steavy
  • 3
  • 3
0
votes
0 answers

Push changed commit to feature branch

I have create feature branch test and push commit 'Test1' to it. Next I have changed names of files in this commit and amend changes to commit 'Test1' locally. The goal I want to achieve is to push this changes to remote feature branch where will be…
netmajor
  • 6,119
  • 13
  • 64
  • 97
0
votes
1 answer

How to merge master branch in local feature branch

In one of case I have created an branch and started to work on. I keep on commit & push changes in local branch but did not merge in master & neither pulled any changes from master. Now I'm done with local branch changes. I followed derekgourlay…
CoDe
  • 10,214
  • 14
  • 74
  • 180
0
votes
1 answer

Feature branching for mobile development

I use feature branching for my web projects, where, for each feature, I create a new branch and open a pull request when the feature is ready to be tested by other members of the team. Using Heroku review apps and Github collaborative code review…
Mathieu Nls
  • 2,015
  • 2
  • 14
  • 26
0
votes
1 answer

Delete remote branches in origin that have already been merged

We are using a branch named 'integration' as our master branch (we still have a master, but we're not using it for now) and we have a bunch of branches that have been created off it then merged back in and need to be deleted. I found this question…
CF_HoneyBadger
  • 2,870
  • 2
  • 11
  • 15
0
votes
1 answer

SVN integrating a feature branch which has been rebased to trunk - why svn:mergeinfo updated despite no changes?

This example is from SVN 1.8. We use the common technique with a trunk and feature branches. Typically a feature branch is created by branching trunk. The feature branch is continually kept up-to-date with trunk by merging changes from trunk to…
user2052153
  • 31
  • 6
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,261
  • 5
  • 48
  • 83
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
  • 2,169
  • 4
  • 25
  • 57
0
votes
0 answers

Can I interactively rebase a public branch when everyone has finished working on it?

We use the feature branch workflow, where developers will create their feature branches, do their work, rebase then when finished merge their changes to master. This allows us to have a nice commit history for separate projects and a fairly linear…
LeonardChallis
  • 7,728
  • 5
  • 42
  • 72
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
  • 22,487
  • 41
  • 197
  • 389
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,079
  • 1
  • 12
  • 27
1 2 3
…
8
9