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
4
votes
1answer
225 views

Make a change that is ignored by future merges

I have a git repository, and I'd like to make a "debug" branch. In the "debug" branch, I'd like to add a line: debug = true; But I want to make sure that any merges back to master ignore that ...
4
votes
1answer
149 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 ...
4
votes
1answer
482 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 - ...
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 ...
4
votes
1answer
184 views

In 'branch by abstraction', how would one do code review?

My manager recommended I consider the technique of 'branching by abstraction', in which, rather than creating feature branches, multiple developers work in the same version control branch, and ...
4
votes
0answers
196 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 ...
4
votes
2answers
744 views

How can I develop a productive Git(hub) branch workflow for an open source project?

I am writing a simple framework that I want to open source just for experience (and fun!). However, it has some cool ideas that could make it grow to a larger project and I want to be ready if that ...
3
votes
5answers
514 views

Versioning: Where exactly in the code or repository should I write the version number?

Right now I'm doing this: Update the readme to include the new version number and what it does. Commit the version number in git commit message (i.e git commit -m "1.2.1: this does that"). Push the ...
3
votes
3answers
432 views

What can I do to let our team have code reviews of branch merges having hundreds of screens worth of Github diffs?

"Code review" (aka "peer review") seems like a really great idea, so my team started practicing it. For a little while it worked well, but then a co-worker merged a branch in, and asked for a review ...
3
votes
3answers
333 views

Getting started with repositories: are they what I need, or are there any alternatives?

I'm a solo iOS developer - mostly self taught, but have made several successful apps so far and potentially starting some slightly bigger projects. What I want to do: As I'm working on some bigger ...
3
votes
4answers
2k views

Should versions be bumped in dev branches or master branch?

I have released API 1.0.0 in the master branch (default branch). Since then I have separately branched to branches api2/foo and api2/bar, both containing backwards-incompatible changes. The API ...
3
votes
1answer
356 views

Does it matter which branch I push to?

My question is around how branch pushes work exactly; I have come across something that doesn't make logical sense to me and as such would like an explanation as to why I am experiencing this ...
3
votes
3answers
197 views

How to restore a feature using Git?

Suppose the following scenario: A new design for a specific page is required. I create a new branch for that design. I implement the design, and merge back into the master branch. Time goes by and ...
3
votes
1answer
201 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. ...
3
votes
2answers
410 views

Branching and CI Builds with Agile

We follow many agile processes, including automated tests, continuous integration, sprint reviews, etc... We're currently having a debate about how often we should branch release builds. We've been ...
3
votes
1answer
2k views

How to organize repository branches? [closed]

I am trying to find a way to organize the branches in my repository in a sensible way. I would like the main branch to contain only "clean" commits: features that are (mostly) complete, no superfluous ...
3
votes
3answers
2k views

Branching strategy for parallel development that won't be in the same release?

My team is working on a product, which for business reasons needs to be released on a regular schedule. An issue has arisen where we want to do development in parallel for the upcoming release, as ...
3
votes
2answers
129 views

How to convert multiple Git repositories for related code into proper branches/tags

Background I've recently become the technical lead/senior developer for a small R&D/data science team. I've got a decent amount of non-lead experience in bigger development teams, but I've not ...
3
votes
1answer
432 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 ...
3
votes
2answers
3k views

One commit in two branches: what happened?

I work on a project using maven and svn. Today after a svn update, the maven build was failing on the svn trunk. When I looked in the svn logs, I saw something strange: a commit affecting two ...
3
votes
1answer
2k views

TFS Branching Advice

I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
3
votes
1answer
481 views

Where should an on-team QC perform testing in a feature branching scenario?

I have searched and found a few questions talking about testing in relation to feature branching. My question is a little different. We are a scrum* team of 4 to 5 developers with a dedicated on-...
3
votes
2answers
786 views

GIT and different versions of a project: what are the best practices?

I'm very new in using GIT as a versioning system and despite a lot of searches, I can't seem to really understand how to handle my scenario. I have this web project that needs to be developed in two ...
3
votes
1answer
435 views

Continuous integration and modifying existing UI automation tests

Our team is currently facing a situation where we are changing a feature that is in the product today. This feature has Selenium automation tests associated with it. We are performing a fairly major ...
3
votes
1answer
429 views

What's a typical team size using a Git repo?

We've been using Git as our version control but as the team grows, there are more and more pains when it comes to getting all our changes onto a single branch ready for a deployment. I'm wondering ...
3
votes
1answer
1k views

What's the best version control/QA workflow for a legacy system?

I am struggling to find a good balance with our development and testing process. We use Git right now, and I am convinced that ReinH's Git Workflow For Agile Teams is not just great for capital-A ...
3
votes
1answer
977 views

use of the master branch in Git branching models

I've seen branching models with a develop and master branch (with features being merged into develop first), where the master branch was always entirely part of the history of develop and would be ...
3
votes
1answer
225 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 ...
3
votes
2answers
499 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 ...
3
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 ...
3
votes
0answers
65 views

TFS Branching an incomplete version

I am working on an application and it is at a point where I need to wait for an API to be delivered to complete it. It's almost there but not quite finished. My manager has told me he wants me to ...
2
votes
4answers
685 views

How do we avoid development files in the release?

Situation: Our Python project is hosted at GitHub. The actual release should only contain handful of files, but or project also contains several non-release files that are required for testing and ...
2
votes
2answers
646 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 ...
2
votes
3answers
2k views

Should I merge the dev branch into my user story branch?

We have a relatively simple version control process: master branch, dev (otherwise known as integration) branch, and our individual branches for every user story. We check out from dev, branch at the ...
2
votes
2answers
5k views

Managing Maven dependencies between multiple components with multiple teams making changes

In a situation where there are multiple teams making changes to some Maven projects with dependencies between them (otherwise unrelated projects i.e. no super POM or anything like that), with each ...
2
votes
2answers
156 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 ...
2
votes
4answers
145 views

Can long lived feature branches be justified by merging master into the feature branch daily

I've always considered long lived feature branches a symptom of some underlying problem, but I've recently moved jobs and the company I am working for now encourages long lived feature branches. They ...
2
votes
4answers
403 views

Managing QA testing when there's pressure to merge things at the earliest possible

I'm working in a team of 12 where we have around 8 developers and a QA. We do not follow a git flow model but we do have feature branches where individual feature developments take place and then ...
2
votes
4answers
5k views

Branch per feature: What are the actual benefits (and risks)? [closed]

I've read quite a lot of posts lately about different branching strategies (e.g a lot of links from To branch or not to branch?), and while almost every article explains on how to do this or that ...
2
votes
1answer
255 views

Merging branches where the same code was worked on

If there are two unrelated tasks, except that the changes are in the same project, and end up touching at least one of the same classes/methods, how do I manage that? Two different developers could ...
2
votes
2answers
243 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 ...
2
votes
3answers
3k views

What does cheap copying/branching mean for a versioning system like SVN?

One of the advantages of SVN over CVS as given here is cheap copying and branching. What does "cheap copying and branching" mean in SVN parlance? How is it different from CVS copying and branching?
2
votes
1answer
233 views

How to manage a single branch

I read the Continuous Delivery: Reliable Software Releases through Build, Test, and Deployment Automation book by Jez Humble and David Farley. The part that throw me off balance the most was their ...
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
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 ...
2
votes
2answers
514 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
151 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
647 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
255 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
162 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 ...