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
0
votes
0answers
89 views

Git feature branch workflow for multiple branched features

I wanted to summarize a quick discussion we had in my stand-up today. We have a big feature branch merge coming up in our system. We are replacing the old live, system (branch master) with a redesign (...
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 ...
-1
votes
1answer
83 views

Branching strategy when utilizing open source application

I'm looking for advice on what a good branching strategy looks like when using mostly open source code. Most of my dev experience is with writing and working with custom made code and only using open ...
-1
votes
1answer
879 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
-1
votes
1answer
199 views

Implement Branching strategy in DevOps for Multi-Tenant application

I have asked this question on Stack Overflow and I got a suggestion of posting it here for better suitability. So here is my question : I am new to DevOps, and i have a solution with Umbraco as CMS, ...
-1
votes
1answer
57 views

Should I further branch off of a new branch or continue developing an additional feature in the same branch?

I have a branch (dashboard) which I am developing a new feature on. To make the example easy to follow, I am developing two separate functions (function1() and function2()). They work how I want ...
-1
votes
1answer
271 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 ...
-2
votes
2answers
475 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
1answer
100 views

Using git on a project with different areas

I'm starting a new project and I'd like to plan it's use with git (using SourceTree) before starting. I work as a self developer and I'm starting a project that will have 3 different areas. This is ...
-2
votes
1answer
190 views

Unit tests branch best practices [closed]

I'd like advice about on the best practice for Pull Requests organizing on middle size project. Especially relating to Unit Testing. Currently we create branch for each feature, what is practically ...
-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, ...
-3
votes
2answers
407 views

Source control with multiple customer-specific repositories

Here is a diagram of how our source control setup is configured. The issue with this setup is how we handle various customers. I would really like to use a different approach than copying the entire ...
-4
votes
3answers
364 views

Is it reasonable for DevOps to insist on 2 branch only integration?

I am the DevOps/CI for my team of somewhere around 10 developers. We develop and implement a sophisticated scientific data collection and visualization web application. I am the person who introduced ...
-4
votes
1answer
50 views

How to track features in trunk based development?

As far as I understand in trunk-based development there are no long lived feature branches, one could even argue that there are no branches because at the end everything will be merged back to trunk ...