Questions tagged [feature-branch]
139 questions
0
votes
4 answers
Git - conflicts between feature branches - how to avoid a feature branch contains changes in another feature branch
The scenarios is as following. I will use t1,t2,t3 and etc. to represent different time:
I have two branches to represent my environments DEV branch, MASTER branch.
t1: I created a Feature_001 branch from MASTER
t2: I added commits in the…
Sheng-yu Tsai
- 41
- 1
- 7
0
votes
0 answers
Automatically create Package Feed on the event of a feature branch creation
The issue is known to many maven based projects using feature branches. In maven, there is no concept of a branch. Now in a git-flow environment there are basically 2 ways to deal with the build artifacts:
modify the version number to something…
marcomeyer
- 178
- 7
0
votes
1 answer
Pushing from feature branch pushed a different branch?
From our develop branch, I created a new branch with git checkout -b jsm/logging. Made my changes, commited, and pushed to origin with git push -u origin HEAD. Did a PR and merged and delted the remote branch. Made another tweak and amended my last…
Josh M.
- 26,437
- 24
- 119
- 200
0
votes
1 answer
File conflict resolution in Feature branch
We started using GitHub as Source control in our project recently and we are using Feature branches to work on the features. Once we are done with our development, we merge it to the develop branch using pull request.
During the merge if there are…
Anee
- 463
- 9
- 26
0
votes
0 answers
How to roll back my change in Git?
I committed change A into my feature branch.
All good so I merged to Develop.
Two other merges B & C, are done to Develop from other feature branches.
A problem comes up with my change so I have to roll back.
Q1. What should I do?
I check out an old…
Scala Enthusiast
- 399
- 8
- 18
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
- 421
- 1
- 4
- 13
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
- 6,671
- 13
- 75
- 136
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
- 608
- 2
- 11
- 42
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
- 359
- 4
- 17
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,507
- 14
- 68
- 100
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
- 11,056
- 14
- 90
- 197
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,285
- 2
- 17
- 32
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,960
- 2
- 14
- 16
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
- 129
- 10