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
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 ...
2
votes
1answer
2k 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 ...
2
votes
2answers
565 views

Finish feature reverted commits from develop

I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that ...
2
votes
2answers
106 views

Releasing from feature branches

My app is being deployed on various platforms, among which GNU/Linux, iOS and Android. I am contemplating the branching model of the central C++ code git repo, upon which all platform-dependent code ...
2
votes
1answer
451 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 ...
2
votes
2answers
162 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....
2
votes
1answer
677 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 ...
2
votes
3answers
257 views

GitHub OS project how to have a good version and a work in progress version

I have started my own OS application, I am hosting it on GitHub. My problem is that I push changes to the repository from more than one location so sometimes I want to work on it and sometimes I can't ...
2
votes
2answers
165 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 ...
2
votes
1answer
2k views

Develop in trunk and then branch off, or in release branch and then merge back? [duplicate]

Say that we've decided on following a "release-based" branching strategy, so we'll have a branch for each release, and we can add maintenance updates as sub-branches from those. Does it matter ...
1
vote
2answers
1k 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 ...
1
vote
2answers
1k views

Using SVN with multiple developers but without creating branches

I'm a computer science TA working with some students in a senior capstone course (effectively, a consultant for a small team). I met with them to discuss how to use version control, and they're in an ...
1
vote
3answers
85 views

Do I need to 'deploy' my web project when I can just keep a recent clone of the Master-branch in public_html?

We have git installed on our webserver (via cpanel), but unfortunately no CI- / Deployment-Tools. Would it be good practice just initialise our repository in /public_html/ and push our local Dev-...
1
vote
3answers
462 views

QA and Feature Branches in Web Development

I am trying to introduce to my team a more sophisticated branching model than "commit to master and push". We are a small team of two analysts, three developers and one tester. At the moment, a ...
1
vote
4answers
1k views

Proper sequence of actions for merging using SVN?

I'm totally new to CVCS (SVN specifically). I find that most resources focus very strongly on the command-line commands (irrelevant; we use Windows Explorer + TortoiseSVN) and about structure (e.g. ...
1
vote
4answers
1k views

What are the risks of having a release branch?

Currently we manage our source code in a Microsoft Team Foundation Server project. We have the following branches: Development Feature 1 Feature 2 Etc. Test The process is that development is ...
1
vote
2answers
615 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
1answer
156 views

Where to commit small, miscellaneous changes

Let's assume that I am working on a small project that uses feature branches to organize tasks. For example, feature/login would be for working on the login functionality and feature/create-new-post ...
1
vote
1answer
628 views

TFS Branch (Lifetime) management

Our team uses TFS for version control. Our branching strategy is as follows: We have a main branch that we use as the dev branch In a four-weekly cycles, we release our software When this is done, a ...
1
vote
3answers
780 views

How to improve our branching model?

I work as a release manager in a company with 15 internal developers and 10 external developers. Setup Code base is a heavily modified Magento (PHP) Test suite is almost non-existent but is ...
1
vote
2answers
2k views

Merging very big branch with master [duplicate]

I have rather big git branch with code that was created on may of this year and never before was merged with master. Compare shows huuuge difference between branch and master: about 50 new files and ...
1
vote
1answer
503 views

Git commit messages with nvie branching model

This Git branching model recommends branching for all development efforts and merging when complete: Branch Develop Merge when complete I'm wondering how this works in practice, given that ...
1
vote
3answers
165 views

TFS non-chronological deployment?

We have the following scenario: Changeset #1 is some unfinished buildable checkin Changeset #2 is a completed small task .. Changset #5 completes the work done at CS#1 They all affect the same ...
1
vote
1answer
67 views

Branching an application setup/installer across versions?

I am wondering whether I should branch our installer script/project-file (we use InnoSetup) with each application release or whether I should keep one in installer script that generates the setup for ...
1
vote
1answer
134 views

Would this be the equivalent of creating a branch, while working with a detached head in Git?

Let's say I checked out a version different than HEAD. Let's say I made some commits, and so an anonymous branch was created. Afterwards I may have checked out a different branch, so now the only way ...
1
vote
1answer
28 views

TFS Branching for Xamarin Common Projects

I have a solution for Xamamrin.iOS and Xamarin.Android application with structure as below, Solution Root Common Project Xamarin.iOS Project Xamarin.Android Project I need to branch both iOS and ...
1
vote
0answers
18 views

How can I make sure a branch gets duplicated in my development and main branches in TFVC?

I inherited a Visual Studio solution with a Main branch, a QA branch off of Main, and a DEV branch off of QA. It seems these are the only branches and they've existed for the lifespan of the solution. ...
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 ...
1
vote
0answers
210 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 ...
1
vote
2answers
715 views

Importing an existing project into Git

Background During the course of developing our site (ASP.NET), we discovered that our existing source control (SourceGear Vault) wasn't working for us. So, we decided to migrate to Git. The ...
0
votes
2answers
186 views

Need a Git branching how-to

Using GitFlow, I created a new class on the develop branch and gave it a property: Public Class Class1 Public Property Property1 As String End Class I committed that change and created a new ...
0
votes
1answer
3k views

Developer Branch vs. Feature Branch [duplicate]

I saw around that development teams usually use source control in one of 2 schemes: Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...
0
votes
2answers
106 views

What's the correct Git flow to develop on two independent features + one feature that relies on both?

I'm trying to find the correct flow to manage this kind of development, where A and B are two independent features, and C is a third feature that relies on A and B. An obvious approach would be to ...
0
votes
1answer
119 views

What's the appropriate procedure for subversion merges? [duplicate]

We have a project with a few release branches and a trunk. Lately we've been adding bugfixes and new features to the release branch, while doing simultaneous infrastructure development on the trunk. ...
0
votes
1answer
379 views

Beta-testing app good practice [duplicate]

I have just released an iOS app for beta-testing with TestFlight. I'm wondering what is good practice during beta-testing? Should I halt development of the app during beta-testing? Should I continue ...
0
votes
2answers
269 views

The two-storey branching scheme **before** the develop branch

I have found many posts about how to organize work on develop branch and up to release branch. Or even how to work without the develop branch. The trend of the "develop" branch going away, ...
0
votes
1answer
250 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 ...
0
votes
2answers
3k views

Branching strategy for frequent releases [duplicate]

We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually ...
0
votes
3answers
3k views

Deployment Tools that Integrate with TFS? [closed]

So I have this issue. The Operations team where I work has taken over TFS because they are using MS Build to build and deploy code to production servers. As a result developers have lost A LOT of ...
0
votes
2answers
171 views

Storing bugfixes as local changes rather than in SVN branch

We are deploying and upkeeping web-sites to different customers. Normally we wait for newest changes to stabilize, then tag subversion version as release, and install than version to customer. Then we ...
0
votes
1answer
136 views

Differences between branching and virtual methods

I was trying to find more info on the matter but could only find this: In C++ why and how are virtual functions slower? The answer says that the virtual call "Get[s] the right function address from ...
0
votes
1answer
312 views

Advice on structuring a Git repo into branches for an iterative tutorial [duplicate]

I'm a teacher and I'm about to publish a tutorial on how a build a PHP app in several iterative steps. At each iteration, I want to provide access to the associated source code and differences with ...
0
votes
3answers
658 views

Git and merge commits

We have three branches: master staging dev We branch per issue and each issue needs to go through testing and staging before being merged to master. We branch feature branches from master and work ...
0
votes
2answers
548 views

Why are these seemingly unnecessary merges happening in git?

Consider this screenshot from our development repository: We are relatively new to git, so things are still somewhat confusing. The question at hand: If you take a look at the commits by me at the ...
0
votes
3answers
594 views

Is it a newbie mistake to avoid branching? [duplicate]

My team is new to versioning and we're trying to keep things simple, as to not overwhelm ourselves with tools-headaches. Also, our product can't be compiled and run locally, so our work is actually ...
0
votes
1answer
3k views

In Git, is the use of a 'PRODUCTION' branch necessary and/or would it be feasible to have more than one of them?

A short summary of how we do branch managing: From the MASTER branch one or many feature branches can be made (for mid to long term development), when deploy-able changes have been merged to MASTER ...
0
votes
3answers
298 views

Does it actually matter from which branch you create a new branch in git?

Well as per title, does it matter in any way functionally (say when rewriting history or something), from which branch one derives a new branch? If at the point of time when creating the new branch ...
0
votes
1answer
291 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 ...
0
votes
1answer
1k views

Choosing the right Release management & Branching strategy

I am working on a project wherein we are to use SVN as a source repository and we need to identify a branching strategy. I am aware of branch by release & branch by feature strategies to certain ...
0
votes
2answers
385 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...