feature-branch Questions

5

Solved

My team is using feature branches to implement new features and continuously deploys snapshot builds into a remote repo for our users to use. Thus 'deploy' really only means 'distributing to a remo...

51

Solved

How do I delete branches which have already been merged? Can I delete them all at once, instead of deleting each branch one-by-one?
Arrogant asked 25/5, 2011 at 15:54

5

Solved

I'm working on implementing Git Flow branching strategy in my company and for that I'm testing all possible options which is provided in SourceTree GitFlow. Two problems I've faced till now: I'm...
Proximal asked 17/11, 2017 at 7:13

5

Solved

I have two (private) feature branches that I'm working on. a -- b -- c <-- Master \ \ \ d -- e <-- Branch1 \ f -- g <-- Branch2 After working on these branches a little while I've d...
Flue asked 15/2, 2013 at 11:9

6

Solved

I am using an intermediate Git repository to mirror a remote SVN repository, from which people can clone and work on. The intermediate repository has its master branch rebased nightly from the upst...
Scullion asked 1/6, 2011 at 10:43

11

Solved

Let’s say we have the following situation in Git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed: echo "On Master" >...
Quentinquercetin asked 6/6, 2013 at 7:18

1

Solved

I have the following scenario: Master-branch: what is in production, can contain hotfixes Develop-branch: the branch my developers are using to create pull requests to feature-branches: the branc...
Concussion asked 15/1, 2020 at 8:55

3

Solved

Here's my scenario: My project is following the topic branching pattern. I create a branch to fix some problems, let's call this branch problem_fixes. I make my changes, and submit a pull request...
Himelman asked 22/1, 2012 at 18:16

2

Solved

I'm working on a develop branch and two different (local) feature branches. a -- b -- e <-- develop \ \ \ f -- g <-- feature-branch-1 \ c -- d <-- feature-branch-2 I incorporated th...
Deviled asked 20/1, 2018 at 13:24

1

I have a LOT of GIT branches on my "remote" server. How can I delete ALL branches (Not just merged) that are older than 1 year? How can I also delete all merged branches (multiple origins "maste...
Laith asked 24/10, 2017 at 15:45

2

Solved

I am getting something unexpected happening in the git tree. I have created a branch off of master, however while I am performing commits on the new branch it appears as though these are taking pla...
Theatricalize asked 5/6, 2017 at 5:34

1

Solved

If developers were to work on different branches for different features I understand that they can give a QA build from the feature branch and once it is tested it can be merged with "develop&...
Adrea asked 8/1, 2017 at 3:42

3

I am using Git Flow with a team. We all branch off of develop for features and merge back in after code review. It works well for us, however we now have one feature that will take a developer over...
Cormorant asked 6/11, 2015 at 12:49

1

I'm looking for a way to introduce changes into feature branches once they have been merged to master. The goal is to keep the feature branch keep only containing commits that are related to it. I...
Bogy asked 27/8, 2015 at 8:48

2

Solved

When I create a new branch B from branch A and do a single commit, TeamCity triggers multiple builds on B, although I would expect just a single build. I set "Trigger a build on each check-in" to t...
Castorena asked 24/9, 2014 at 5:53

1

Solved

I am currently trying to set up TeamCity to build all the branches which are not my team's main branches. I have had trouble getting this to work, and have only gotten this to function with the def...
Interbreed asked 4/11, 2014 at 15:41

4

Solved

“feature branches” is when each feature is developed in its own branch and only merged into the main line when it has been tested and is ready to ship. This allows the product owner to choose the f...
Lavender asked 28/10, 2010 at 15:24

2

Solved

After reading this article, it makes sense to rebase to gather changes from the main branch on to my feature branch: Git workflow and rebase vs merge questions clone the remote repo git checkout -...
Wasp asked 29/6, 2012 at 22:29

2

Solved

Let's say I have a feature branch called FeatureA, and it is out of sync with (remote) development on which it is based. Normally I would rebase my branch by calling git rebase development (after s...
Sharenshargel asked 11/3, 2014 at 20:30

2

Solved

We use TeamCity and GitHub Enterprise. We use an open-source-esque workflow with git: there's a mainline repository for each component, and when people want to make changes, they fork mainline to...
Pleat asked 19/9, 2012 at 12:32

3

Solved

What are "Feature Toggles" and "Feature Branches" and what's the difference between them? What are the pros and cons? Why is one better than the other? I found some articles on Google regarding t...

2

I have a develop branch and a feature branch in my git repo. I added a commit to develop and now I want that commit to be merged to my feature branch. If I do this git checkout feature git merge d...
Roundelay asked 25/7, 2013 at 13:48

3

Solved

I am researching switching from starteam to Git. Currently, in starteam, we use "floating views" with special names. These floating views basically work like aliases. Therefore, we ...
Lyndseylyndsie asked 16/1, 2013 at 19:11

1

Solved

Our development/release cycle works like this: Developer creates a feature branch, implements a feature Developer indicates feature is ready for acceptance testing (UAT) Tester deploys feature br...

1

In recent times I seem to have this repeating scenario of having multiple feature branches under development, with one feature branch (feature-b in the below picture) depending on support of anothe...
Cacilie asked 21/11, 2012 at 12:17

© 2022 - 2024 — McMap. All rights reserved.