Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

139 questions
1
vote
1 answer

Git Flow: creating, testing, and deploying "feature" branches

I've been using git-flow at my company for a little while now and have come across a certain situation various times that boggles me. I'm trying to figure out a best practice to integrate new features to an existing published site via git-flow,…
seansean11
  • 11
  • 2
1
vote
1 answer

Is there a convention for hotfix releases using git with the Feature Branch workflow?

When using the Feature Branch workflow with a small team (not Gitflow), is there a convention for applying a hot fix to a release that was previously tagged on master? For example: v1.0.0 is released at a particular point in time, at which time a…
mliberatore
  • 341
  • 1
  • 10
1
vote
2 answers

Melting together merge commits

This question is very related to git rebase interactive: squash merge commits together. Suppose you are writing a new feature for a certain project. You start from a certain branch, say devel, and you build a branch for your feature, feature/X. From…
Dacav
  • 13,590
  • 11
  • 60
  • 87
1
vote
0 answers

Git: Re merging or rebasing on top of several dependent branches

I often find myself developing a feature branch which depends on the two or more (mutually unrelated) branches forked from the same commit. My commit tree usually looks like this: o -- o master |\ | o -- B feature-1 | \ | o -- A …
eold
  • 5,972
  • 11
  • 56
  • 75
1
vote
1 answer

Reconciling Branch-per-task and bug fixing when the bug was fixed and merged to trunk, but the bug was not actually sufficiently “fixed”

I’ve recently switch from CVS to Plastic for source control. We use Jira for issue tracking, and Plastic branches to link change sets with open issues. With the switch, I’ve also adopted the branch-per-task approach to development. This has lead…
SilverKnight
  • 182
  • 1
  • 8
1
vote
1 answer

Git: How to avoid conflicts on merging a feature branch after a previous merge revert

In our repository we develop features based on feature branches. Lately I integrated a feature feature/myfeature into master: git merge --no-ff feature/myfeature After this merge some more development happened until it turned out, that this feature…
bentolor
  • 3,126
  • 2
  • 22
  • 33
1
vote
2 answers

How can I use git to deploy JUST one feature at a time after QA and Business Acceptance?

What we need: My team is maintaining and adding features to a product that's already in production. We are trying to figure out how to improve our deployment strategy so that we can begin deploying one feature at-a-time instead of large chunks of…
Byron Sommardahl
  • 12,743
  • 15
  • 74
  • 131
1
vote
2 answers

Gitolite config won't deny permissions

I'm having a config file like this: @all = @group1 @group2 @group3 @group1 = user1 user2 user3 @group2 = user4 user5 user6 @group3 = user7 user8 user9 repo production_repo RW+ = server_key R = @all R group_branch1…
Daniel
  • 157
  • 2
  • 12
1
vote
1 answer

Best way to manage local feature branches with git?

I am looking at some of the finer points of branch management with git and was basing a few of my decisions around this article: http://nvie.com/posts/a-successful-git-branching-model/ Now we have a slightly simpler scenario here, remotely on origin…
Grofit
  • 17,693
  • 24
  • 96
  • 176
0
votes
1 answer

Is there any way to clean up remote repositories while keeping these repositories' commit logs?

I know how to delete remote branches, so this question isn't: cleaning up old remote git branches or how to manage obsolete branches on github Rather, my problem is that deleting old feature branches will lose the commit messages and with them, the…
kayaker243
  • 2,580
  • 3
  • 22
  • 30
0
votes
2 answers

How can I move old commits in a branch to a new branches?

I have a branch called staging that contains old commits that I would like to move to two separate branches. A - B - C - D - E - F - G - H - I staging I would like to move commits B and C to a new branch: feature-a. Then move commits D, E, and F…
Timothy Fisher
  • 1,001
  • 10
  • 27
0
votes
2 answers

what does feature branch contain

I tried to google the answers and got articles all about branching models and how to create feature branches, which are not the answers I am looking for. I know I might not use the proper key words to search the answers, the guide about the key…
Crane
  • 1
  • 2
0
votes
2 answers

How to run code formatting tool on every commit in feature-branch with git rebase

We introduced php-cs-fixer into our codebase and I want to rebase an existing feature branch. We enforce a semi-linear history, so every feature branch is rebased before merging without squashing the whole branch. To keep the history clean I want to…
MaPePeR
  • 931
  • 9
  • 18
0
votes
1 answer

How to share code between 2 feature branches

Let's say I've written a method in feature1 branch and after some time I realize that I need this piece of code in another feature2 branch as well. So I just copy/paste the code from feature1 into feature2 and the work simultaneously continues on…
Saeed Farahi
  • 53
  • 1
  • 5
0
votes
1 answer

Git rebase while working on feature remote branch dilema

I have seen so many posts and blogs about git rebase on feature branch, but still confused 100%. Scenario: I did the following steps while working on a newly created feature branch from master. % git clone % git checkout -b…
PineCone
  • 2,193
  • 12
  • 37
  • 78
1 2 3
…
9 10