Questions tagged [branching]

Branching, in revision control is the duplication of an object under revision control so that modifications can happen in parallel along both branches.

Filter by
Sorted by
Tagged with
2
votes
2answers
240 views

How to address tangential refactorable code in a feature branch

[Summarized answers inserted] When working in a feature branch and I find code that should be refactored that is not related to the branch aside from the fact that it is in the same file I am working ...
1
vote
2answers
475 views

One huge git repository: How to handle releases and branching?

Imagine the following git repository: / /ProductA/product_a_main.py /ProductB/product_b_main.py /SharedLibrary/shared_library.py SharedLibrary is used by both ProductA and ProductB. ProductA and ...
1
vote
2answers
101 views

Avoid wrong variable on branch commit

Our frontend web software contains, inside a file called url.js a variable used as URL root for REST webservices. var url = "https://devappserver:8080"; During development on developer PC, for ...
2
votes
2answers
160 views

How to publish 2 feature branches on QA?

I have the following scenario: Joe is working on the feature-xx branch. Richard is working in another feature-yy branch. Their company has a qa.myapp.com environment where testers work. Joe pushes ...
-1
votes
1answer
268 views

development branch information in release management tool

I'm designing a tool in my organisation to help me with release management. The organisation is composed of several small teams that manage their own repositories in git. The release manager is ...
13
votes
1answer
6k views

Where does refactoring belong in GitFlow branch naming model?

I recently started working with GitFlow model as implemented by bitbucket. And there is one thing that is not completely clear to me. We try to regularly address our technical debt by backlogging, ...
5
votes
3answers
1k views

Do we need a separated branch for fixing bugs raised during the testing phase?

Before release a new version of the software, which is a web application, my company creates a release branch. The QA team tests that branch and reports some issues. Should developers commit the ...
4
votes
1answer
455 views

Branching strategy for moving feature branch between versions

At my workplace, we use an SVN repository for the source code, which holds the main application and some other projects, and for the main application it is structured like this: - trunk - app - ...
19
votes
8answers
1k views

Keep branches from piling up

We're beginning to run into a problem as we get bigger, where features make it to staging for testing, but by the time everything is tested and approved new features are on staging for test. This is ...
25
votes
8answers
4k views

Git - What issues arise from working directly on master?

I have seen lots of advice about git branching models and the most common opinion seems to be that making changes directly on the master branch is a bad idea. One of our co-workers is quite happy ...
5
votes
2answers
1k views

Long-term branch - when and how to merge it?

In my computer science capstone project, we have a team of 5 working on various things for an Android app for Pokemon as a multiplayer game (Github). One or two people are working on implementing the "...
2
votes
2answers
148 views

Using Pull Requests with different commits

For a new project we try to set up the development process and the intention is to have a simple, pragmatic process. We use Atlassian Stash with Git in our company. We came up with the following ...
0
votes
1answer
48 views

How to work with starter kits and their updates?

When I start a new project based on a nice starter kit like this Angular 2 one. How do you keep up with changes to a base repo like this? I know that it is a 'starter', but it would be nice to merge ...
3
votes
1answer
429 views

SVN best practices - different code logic in branches

While working with one project I was assigned to, I noticed a small problem with our SVN strategy. A few months ago, someone created a new feature branch from our trunk. In this branch he implemented ...
6
votes
1answer
266 views

Workflow for a Github fork with compatible and incompatible changes

I've forked a Github repo and added an upstream remote as described here. I expect to make some backward-compatible bug fixes for which I'd like to submit upstream pull requests, as well as some ...
3
votes
2answers
486 views

Git workflow - possibly long running branches for future release

I am a member of a small team which is part of a larger team of developers working with Git. We (the larger team) have a main branch in a central repository into which we commit our work for the next ...
0
votes
1answer
274 views

Simpler git-flow model, am I doing it right?

I'm trying to implement a branching model that is similar to git-flow, but simpler (no release or hotfix branches). The idea is to have the master branch always up to date with the latest tagged ...
3
votes
1answer
220 views

Branches, builds, releases and multi-platforms

I'd like to check what best practices are avail out there. I have the following requirements: I have a repo which is used for development (master and develop branches). I would like to keep track of ...
1
vote
2answers
815 views

Git - single or multiple branch

I am working on this project of mine where I am the only developer. I have chosen git for the version control for the project. Currently, I work from multiple systems and commit to the master branch ...
0
votes
0answers
106 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
11
votes
4answers
586 views

Should You Improve Code Quality Whilst Working on a Feature Branch

I really like this article about leaving the code/camp site in a nicer state than you found it - it seems like a practical approach in the real world to keep on top of code cleanliness. I also ...
2
votes
0answers
1k views

Does TFS have the capacity equivalent of branching/forking in Git?

We've got talking about branching and forking in Git and a teammate asked if there's something like that in TFVC (hereafter referred to as TFS). I explained that there is, although it's managed ...
4
votes
3answers
120 views

Feature branch which never made it into develop

I am cleaning up our git repository and there is a feature branch which contains a prototype of an interesting feature which the management decided not to include soon in the product. What do you do ...
-2
votes
1answer
46 views

Handle multiple parallel wide modifications using branching in VCS

Here, the term of branch is understood as a git branch. I don't know how branch works in other VCS, but its probably VCS-agnostic. Given a branch base, and around it many other "satellites" branches, ...
4
votes
1answer
144 views

Workflow and process when branches have dependencies in git for code reviews

A fairly common workflow for working with git is: Fork master Make changes/add functionality in branch Make pull request for your branch vs master Merge pull request (after code review, automated ...
3
votes
1answer
199 views

How to improve our source control process

Background: We are using agile project management and follow sprints to do development. We are using a single repository in bitbucket.org that uses mercurial. Repository is hosting 3-4 products. ...
1
vote
1answer
378 views

More than one deployable git branch

My dilemma is about the GIT flow. Let's assume that I have an application that can be deployed differently (staging release, QA release, production release). Since the application has profiles to be ...
4
votes
1answer
126 views

Do feature fixes need to be local only?

From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin. This kind ...
4
votes
2answers
89 views

Branching and Merging Business Data

We're working on a project wherein the business users operate on a set of data that is periodically published. We've labeled the publishing milestones as Versions, and, due to some business ...
14
votes
3answers
6k views

Git branching strategy for long-running unreleased code

At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic. Traditionally we've had feature branches for each Story, ...
7
votes
4answers
2k views

How to determine when to open a new branch or a new repository when using Git?

Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
6
votes
3answers
203 views

Do we need to create local branches for the enhancements we are working on?

We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
8
votes
1answer
889 views

Merge bug fixes from trunk in old branches

We are now in the process of switching from svn to git (after a year spent on convincing people, yay!) in my company. So far, this is all for the better but there is one little thing that we ...
-2
votes
2answers
472 views

If you decide that branching is a bad thing, then why use Git over SVN? [closed]

I have used Git and Mercurial a bit over the past ten years and appreciate and prefer them, but most of my experience is with SVN. If it is decided within a corporate programming group that branching ...
2
votes
2answers
644 views

Making major version step in software development in separate repository [duplicate]

Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
139
votes
9answers
15k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
2
votes
2answers
114 views

Mercurial Branching from a branch

We are in a situation where the customer has requested an urgent deployment of the current features we are working on. These features are being developed in a mercurial branch named 'sprint 1' for ...
11
votes
6answers
2k views

How can we only include ready-to-be-released features in our production releases every other week?

I'm a software developer on a fairly large agile team (we have eight developers actively making changes to a single code repository). Every two weeks, we push a new version of our software to ...
1
vote
0answers
204 views

Justification for different code bases on different branches in the same repo? [closed]

Branches in git repos or similar are practically always derived from the same code base; after all, they're usually merged back in to master later. But, if you wanted your open source project on ...
2
votes
2answers
149 views

Bugs showing up with merge on the release branch

When trying to follow the the gitflow model, we have a branch for the releases. However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from this....
11
votes
1answer
4k views

Git branching from a feature branch to work on a subfeature

We're currently in the following situation, where a feature branch has been branched for a sub-feature branch (like, working on backend and frontend things for the same feature): o | o development |\...
4
votes
1answer
126 views

How to prevent accidental deployment of branch under a legacy deployment process?

We have a feature branch right now in development that must not be deployed to production. At the moment there is nothing that would prevent such a mistake from happening. Deployment happens manually ...
0
votes
1answer
243 views

How do I bundle library files for use in branches?

I work at a company which has it's source code managed using subversion. Our code base is huge (800MB) but we want to work with branching. For what I noticed is that when branching, SVN just ...
2
votes
1answer
630 views

Avoid branch conflicts/race conditions with task branches

Background Support and Sprint are the test branches for bugs and tasks Each bug gets a new branch from master, which is merged into Support, when tested good, a pull request is made between the ...
3
votes
0answers
191 views

Proper GIT repository usage that accommodates feature branches and parallel testing

After reading around I found that there were various git workflows being used but there aren't enough (or I just haven't found them yet) info on how to use git properly with having test builds. I was ...
2
votes
1answer
1k views

Git branch model critique: always derive from master

I am currently working on a large project involving at least 3 teams working on separate feature sets in the same codebase versioned on Git. Some features require back-end integration and ...
11
votes
6answers
2k views

In git, how to do versioning for a dozen libraries all worked at in parallel

We are doing projects, but we reuse a lot of code between the projects and have lots of libraries that contain our common code. As we implement new projects we find more ways to factor out common code ...
34
votes
3answers
17k views

Reusing a merged branch, good practice?

Currently, I used to create a new branch each time I have to add a new feature to my application. When my feature is finished and functional, I merge it with the master branch. But later, when I ...
5
votes
1answer
1k views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
5
votes
2answers
438 views

Git branch usage - keep an old, never merged branch around or delete it?

I'm working on a small project, and I am using Github as version control. I made a new branch to test something out, and have decided I liked the previous method better (in the master branch). What ...