Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

139 questions
1
vote
1 answer

Local Commits after merging

I was working on a feature branch (let's call it DEV-1234), not yet made any changes, came back to work after a few days break and of course the develop branch had a huge amount of changes in it which I wanted to merge to my feature branch so as to…
Steve Waters
  • 3,348
  • 9
  • 54
  • 94
1
vote
1 answer

How to make "git merge --log" stop flattening merge commits

I am using a successful git branching model, where you have master branch only consisting from merge commits with version tags, and all the development goes on develop branch. The develop branch also consists of merge commits (feature branches) and…
c_spk
  • 169
  • 16
1
vote
1 answer

Strategies for building and storing Feature branches using Maven and Artifactory

I am currently trying to strategize the best way to store feature branches in Artifactory and use the feature branch SNAPSHOT builds in a dev environment. The feature branches are of the form: feature/X.X-Feature-DTBXXXXX-SNAPSHOT So far I have…
k1992
  • 11
  • 3
1
vote
2 answers

How to reset and apply it to all users local banches?

We have this branch structure: master (build/deployed on production) qa (build/deployed on Q&A environment) features branches So we create a feature branch from master and then merge it to qa (created from master) when we need to validate the…
remi bourgarel
  • 9,231
  • 4
  • 40
  • 73
1
vote
1 answer

Git-Flow - Creating new features before release is completed

Fairly new to Git and a standard Git-Flow. Looking for a bit of advice on a particular scenario: We create a feature branch off the develop branch (Feature1) and finish the feature. This 'finish' merges the feature back in to develop. A new feature…
Jamie H
  • 97
  • 7
1
vote
2 answers

Find the branch tag for all the changes against a feature

We use JIRA in our organisation. I am unable to find the branch tag/commit-id against particular feature. Is there something I'm missing? To understand a feature I want to understand all the changes that were made for this feature. How do I go…
0726
  • 315
  • 2
  • 13
1
vote
2 answers

Show commits affecting a file that are not in a feature branch?

Given branch-a and git rebase origin/master branch-a, sometimes you get conflicts in a file. CONFLICT (content): Merge conflict in .../file.txt Given that before the rebase there were no conflicts (by definition), then conflicts can only have…
user400575
  • 3,555
  • 2
  • 17
  • 11
1
vote
1 answer

Implement feature branches in TeamCity VCS plugin

I'm currently adding support for feature branches in the Plastic SCM VCS Plugin. I think I have everything ready (clearly I'm wrong) but TeamCity detects all new changesets to belong to all branches. This renders the plugin unusable, since a new…
MiG42
  • 48
  • 1
  • 6
1
vote
1 answer

Git feature branch: getting only one merge commit

Following situation. I work on feature branches in git which I merge into common develop branch when I'm finished with the corresponding feature. Since it can take considerable time to get a feature completed, I merge the develop into my feature…
Ewgenij Sokolovski
  • 897
  • 1
  • 12
  • 31
1
vote
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,684
  • 3
  • 19
  • 33
1
vote
4 answers

Git: how to separate out a feature branch after the fact

How can I move some commits of a feature from an existing branch into a feature branch, and effectively remove them from the current branch - as if the feature was developed in a separate feature branch? Background: the branch develop contains…
Dr. Hans-Peter Störr
  • 25,298
  • 30
  • 102
  • 139
1
vote
2 answers

Can I configure pulls from an upstream repo to always be fast-forward only?

My team uses a feature-branch workflow with git. I'd like to somehow config a git pull upstream branchname from the upstream repo to always be git pull --ff-only upstream branchname. Is that possible? I'd also be happy if I could configure the…
Doug Schmidt
  • 207
  • 2
  • 13
1
vote
0 answers

Git - Using multiple concurrent master/develop pairs and merging feature branches to both

We have a code base for a grails plugin that actively supports two versions of grails. There are some core differences in the layout and configuration of each version, but the functionality provided by both should be near identical. I would like to…
brasskazoo
  • 76,030
  • 23
  • 64
  • 76
1
vote
1 answer

Sync feature branch with master without rebase?

At work we develop on top of a feature branch model where all integrations end up in the master branch eventually. We branch from master and merge to master. This results in a very complex history graph and we are looking at ways to simplify our…
rfgamaral
  • 16,546
  • 57
  • 163
  • 275
1
vote
2 answers

Reintegrate a branch without merging in trunk changes

I use tortoise svn. But I'm fairly new to svn in general. I have some experience with git though. In the docu it says Reintegrate a branch This method covers the case when you have made a feature branch as discussed in the Subversion book. All…
user3119817
  • 13
  • 4
1 2 3
…
9 10