Questions tagged [feature-branch]
139 questions
2
votes
2 answers
Gitflow and Accidently Merging other features
We've recently started to introduce gitflow, following mainly some youtube videos and some online articles - along with the GUI functionality within SourceTree.
However we think we're doing something wrong as we're hitting situations which we were…
owenmelbz
- 6,180
- 16
- 63
- 113
2
votes
1 answer
Feature branching with feature toggling when trying to do continuous delivery
I'm trying to understand why some teams use feature toggling if they are already using feature branching and trying to achieve continuous delivery. Let's say a team wants to achieve continuous delivery and can do that with help from either feature…
Mikkel
- 1,771
- 11
- 35
- 59
2
votes
1 answer
Is it safe to delete or remerge a Gitlow feature branch after it was previously merged into the develop branch?
Let's take the Gitflow branching style. For every feature we have a "feature branch". We develop the feature and once it's done we can merge it into the "develop" branch.
Once the merge is done, can we simply delete the branch and nothing will…
Vlad Mihalcea
- 142,745
- 71
- 566
- 911
2
votes
1 answer
Merging feature branches to release branch instead of trunk
I have a question about two source control scenarios, both with feature branches and release branches:
In scenario 1 feature branches are merged to the trunk.
In scenario 2 feature branches are merged to the latest release branch.
What are the…
Ole Lynge
- 4,457
- 8
- 43
- 57
2
votes
2 answers
Disable feature in master (git)
We are developing a feature in feature/x. We need to merge this feature into master every now and then and also merge master back to feature/x to stay in sync. The feature/x branch also exists as a remote branch, so rebasing is not a very good…
raimohanska
- 3,265
- 17
- 28
2
votes
1 answer
Feature branches in mercurial
I noticed a problem:
In Mercurial bookmarks are intended to be used for feature-branches and be the equivalent of branches in Git. But In Git revision is always has an information about to which branch it belongs. So in Git we are always can say…
Gill Bates
- 14,330
- 23
- 70
- 138
2
votes
1 answer
Git Feature Branches in CruiseControl.Net
It looks like the git source control provider for CruiseControl.Net will only monitor a single git branch. Is there a way to make it monitor all git branches? I know you can do this in Jenkins by setting 'Branches to Build' to '**'. Is there similar…
Nathan Roe
- 844
- 1
- 8
- 22
1
vote
1 answer
Workflow to sync feature branches
I'm quite new to Git and GitHub, so please help me with this question!
I want to contribute to a github project, so I did the following steps:
I forked the original repository (the so called upstream, right?)
I git cloned my fork locally (git clone…
JBach
- 513
- 1
- 4
- 8
1
vote
2 answers
How to manage this merge in Hg?
I took a clone of an Hg repos a while ago, and have been making significant local commits (major version change).
In the mean time, the trunk has advanced slightly; several commits, but trivial changes.
Whats the easiest way to manage merging this…
Andrew Bullock
- 36,616
- 34
- 155
- 231
1
vote
0 answers
Keep local information for branches
There is a git repository consisting of frontend and backend where the main branch is always deployed to test server X.
The feature branches of our team only change a specific part of the backend. On those branches we want to do testing on our own…
J Fabian Meier
- 33,516
- 10
- 64
- 142
1
vote
1 answer
How do I merge one git feature branch into another one?
Our project has a Git develop branch and each developer is working on a specific feature branch that was created from that branch at some point.
So let's say I have the feature1 branch and the feature2 branch, and I need in feature2 some changes…
Eliezer Gallego
- 45
- 1
- 4
1
vote
1 answer
How to perform an action after branch merge/close in Azure DevOps
I want to be able to create and deploy a web application when a feature branch is created from a linked Git repository in Azure Devops and then remove the site and files when the branch is closed.
Creating a new site is straightforward using…
Graeme Muir
- 31
- 1
- 5
1
vote
2 answers
Test dependent git feature branches before integration to main - handle pre-releases
Key Point:
I'd like to ensure that no commits and changes are missed in the step of creating a software release, especially if some commits have been cherry-picked or rebased due to prior testing.
Edit: It's clear that - in the end - a human has to…
Jan
- 310
- 1
- 7
1
vote
1 answer
How can I compare two Git branches and only list the new commits in the feature/topic (second) branch
I have performed the steps below, but when I compare the develop branch with the feature branch I see two commit messages instead of only just 1 commit that I expect to see. One is the previous commit which is already in develop and the other us the…
Kar
- 790
- 13
- 36
1
vote
1 answer
How to rebase entire master branch of git repo
I am pretty new to git, so I apologize if this is a simple solution.
I need to rebase the entire master branch of a repo to a feature branch. The repo was made, then someone used master as the first feature branch. So, what I have now is:
A -- B --…
BrianH
- 337
- 1
- 6
- 12