All Questions

Tagged with
Filter by
Sorted by
Tagged with
2
votes
4answers
117 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 ...
0
votes
1answer
82 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 ...
1
vote
1answer
140 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 ...
0
votes
1answer
144 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,...
4
votes
3answers
242 views

What's the best approach when you need to work off two branches that still have pending PR requests?

Let's say I have branch-1 (branched off master (major update)) and branch-2 (also branched off master (minor update)). What is the best approach to do when I need to create another branch, e.g. ...
0
votes
2answers
163 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 ...
-2
votes
1answer
168 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
4answers
294 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 ...
0
votes
0answers
84 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 (...
4
votes
5answers
301 views

Git branches: Merging issues while having multiple release branches

We have to support multiple releases, so we are following git branching model similar to the above diagram. Now the problem is that we have to do lots of merging here example for fix/011, we are ...
3
votes
5answers
448 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 ...
-1
votes
1answer
73 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
vote
3answers
84 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
votes
1answer
187 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, ...
2
votes
1answer
53 views

managing multiple git repo that are similar [closed]

We are creating several websites, the main content will be the same across each of them but there will be some differences (e.g. extra button, extra texts, different styling) what is the best way to ...
-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 ...
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 ...
4
votes
2answers
358 views

Is there a recommended Git branch strategy for two products in the same repo?

My team has a Git repo for a large service that incorporated a related, but fairly unique, micro-service. We recently decided to separate out the micro-service into its own service in terms of release ...
221
votes
14answers
37k views

New developer can't keep up with branch merges

I am the new developer - this is my first programming position. My issue is this: We use git - I cut a branch from our develop branch, then I start working on the minor task I've been assigned. It's ...
4
votes
4answers
2k views

Do we really need a master branch or can we release straight from a release branch?

Currently we have the following branches: Develop Release 1 Release 2 etc.. Master When we want to cut off new features for a release, we create a new release branch (say release 3). We then only ...
-3
votes
2answers
363 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 ...
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 ...
0
votes
2answers
226 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, ...
-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 ...
5
votes
1answer
4k views

How does one name branches that are bug fixes for a release branch in git-flow?

In order to have make sure all code eventually goes through pull request code review, we've started creating branches for features and bug branches off of develop following the git-flow style. The ...
63
votes
7answers
20k views

Working on a branch with a dependence on another branch that is being reviewed

How does git help deal with the scenario below: I have a task broken down into 2 parts: backend task and frontend task. I make a pull request to merge the backend changes and wait for it to be merged ...
2
votes
1answer
914 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
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 ...
1
vote
3answers
663 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 ...
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 ...
20
votes
3answers
11k views

Where should QA team do the testing in Gitflow branching model

We are a big team (10-12 developers and 4 qa) working on multiple projects with the same git repository. Its a spring boot based backend web service. We are looking for a good git branching and deploy ...
4
votes
1answer
194 views

How can I split work done in one branch without conflicts on merge?

Scenario: I have a production (P) branch and my current (C) branch I created to work on some new features. Some of them are ready, however work on the rest will take more time than anticipated. I ...
3
votes
3answers
196 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 ...
1
vote
2answers
478 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 ...
13
votes
1answer
7k 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 ...
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
150 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 ...
6
votes
1answer
267 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
487 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 ...
1
vote
2answers
820 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 ...
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
146 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 ...