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
1answer
224 views

Branching strategy with GitHub releases

I am working on the project where currently we have following three fixed branches Develop - The code is deployed to development environment. It's a base branch for anyone who want to add new ...
0
votes
1answer
167 views

Any advice for Git workflow using branch per development team (and not per feature)

In our project, we have 5 teams working on a monolithic application in 3-week sprints. Until now, all commits go into master (via Gerrit). Our test pipeline is too lengthy to ensure quality pre-commit,...
0
votes
2answers
75 views

Will introducing a long standing Dev branch create unnecessary maintenance overhead?

I am seeing bad practices occurring in our version control where my colleagues are creating their own versioning system with stored procedures so that they can compare results before/after changes and ...
0
votes
1answer
251 views

TFS/VS Branching strategy with separate Web API's

So we have 3 branches that match our environments for all our projects (Dev, Test, Main). We have a dev server, test server, then production server and when we commit to each branch a build and deploy ...
0
votes
1answer
1k views

How to properly develop in different SVN branches with Eclipse IDE?

I recently got into a slight argument with the other developer on my team about the correct way to develop with SVN and Eclipse. My way of developing in multiple branches is by creating new workspaces ...
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 ...
0
votes
1answer
69 views

Usage of “bugfix” to refer to UI changes in branch names

If a user interface has an undesired look (elements not having padding or margins when it would be appropriate, etc.) and I implement a correction in a new (named) source control branch, would it be ...
0
votes
1answer
436 views

How do you plan releases with new features in a development / releases branch model?

We are trying to implement a branch model in Mercurial. We have read the "Successful GIT branching model" and I proposed another, based on branched version numbers. Then I ended accepting the model ...
0
votes
1answer
137 views

How would you manage development between many Staging branches? [duplicate]

We have a Staging Branch. Then we came out with a Beta branch for users to move whenever they wanted to from old Production branch to the new features. Our plan seemed simple, we test on Staging, ...
0
votes
0answers
221 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
2answers
76 views

Working on a two branches, that are not dependent by business meaning, but dependent by implementation

I have a class Foo with lots of fields and have two tickets to refactor that class. the first ticket is to rename it to Boo and two move it to another package. the second one is to rename some fields ...
-1
votes
1answer
271 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
891 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
402 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
284 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
516 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
3answers
164 views

What is the best GIT workflow with CI/CD with submodules in a master to a test environment and a stable branch to a production environment?

We have a several GIT repos in Azure DevOps with .NET Core web applications that are related to each other with the use of submodule (we used autocreation of NuGet Packages in a private NuGet store, ...
-2
votes
2answers
750 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 ...
-2
votes
1answer
103 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
518 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
47 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
130 views

Using Github Branches to maintain two versions of a project?

I have a Github project for a Django web-app that one team uses. Other teams are interested in also using it and they'll need separate instances of it (it's a stock tracking database so they need to ...
-4
votes
3answers
463 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
81 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 ...

1 2 3 4
5