Questions tagged [git]

Git is an open-source DVCS (Distributed Version Control System)

Filter by
Sorted by
Tagged with
0 votes
1 answer
61 views

What will the best way to manage access to the app projects Git repositories with shared service classes within one solution?

I have been programming in C#/.Net and other languages as a hobby for over 6 years, so I do not have adequate knowledge about application architecture, hence my request for advice. The current ...
bakunet's user avatar
  • 103
-2 votes
1 answer
117 views

How to go about version numbers in a C# solution

My current situation: I would like to apply this to a solution containing multiple projects (one executable and different libraries) in C#. Additionally, I have a project that packs the executable, ...
jav's user avatar
  • 113
1 vote
2 answers
144 views

Is 'backporting fixes and creating releases' a common job role?

Context: The software development company I work for develops an application which is released with SemVer versions. Typically customers use the last 2-3 minor releases, so for an example if the ...
FabianTe's user avatar
  • 121
-2 votes
1 answer
229 views

Why does this procedure lead to a merge conflict?

I am very new to Git and trying to follow along with Git Prodigy by Ebenezer Don to learn about it. I am at the (early) stage wherein I am learning about git revert. I produce the text file prac.txt ...
EE18's user avatar
  • 107
0 votes
6 answers
186 views

How to use trunk based development when using Scrum [closed]

In Scrum we do a 2 week sprint and ship the features after the sprint. I have heard a lot of good things about TBD, but does it conflict with Scrum? Can anyone share your workflow if it is possible ...
user34401's user avatar
  • 741
0 votes
3 answers
324 views

Is my git branch strategy best practice?

We are a small software team with 6 members. We are working on different software projects in our company. Before I joined the team no version control system was used. It was/is my task to reorganize ...
Jakob's user avatar
  • 21
9 votes
11 answers
7k views

Where to keep the code that I do not want in the main?

I made some changes that, after testing, I decided not to use for now. Thus I don't want them in the main branch. However, I don't want to discard them altogether (maybe I will need them later?) What ...
sds's user avatar
  • 861
35 votes
11 answers
7k views

What do you do with branches you've abandoned?

For instance, I've started working on a new feature and created a featureX branch. Later, we decided that we no longer needed the feature. What should I do with featureX? I see value in keeping the ...
Jamie's user avatar
  • 471
1 vote
2 answers
217 views

Where to tag releases to achieve "build-once, deploy-everywhere" using GitFlow?

TL;DR: Using GitFlow, which commit do you tag to identify the build of your next release? If you tag the merge commit on main, you'll need to rebuild and deploy something you didn't test on QA (and ...
Kurt Bourbaki's user avatar
1 vote
1 answer
154 views

Git Branching and Merging Strategy for Feature-Oriented Release Process

We have multiple developers contributing to a project, using Git as our repository. We have a QA branch that matches our QA environment and a master branch that matches production. Features can be in ...
Lisa S's user avatar
  • 21
1 vote
0 answers
101 views

How to store an encrypted filesystem in a single file on disk on multiple platforms (maybe not portably), or alternatives

I'm in the very conceptual phase of designing an open source password manager that provides distributed Vaults that can be simultaneously accessed and managed from multiple devices with the promise of ...
Nick Williams's user avatar
16 votes
5 answers
5k views

Best practices for reverting others' work (commits) and the 'why' for it?

Recently I've had an argument with a teammate that I wanted to have a reverted commit on the master branch from where releases are made as a standalone commit and not merged with future changes. My ...
Bruno Bieri's user avatar
0 votes
2 answers
186 views

How should we set up our git structure?

this is a robotics team with some questions. Here's our current setup, using GitLab: Currently, we have a main branch as well as a separate branch for each of our programmers. When they want to start ...
1082 X's user avatar
  • 11
1 vote
2 answers
238 views

Can 1.0.1 be "applied" in 1.0.0 and in 1.1.0?

Regarding my last question: Can 1.0.1 be launched right after 1.1.0?. I learned that releases can be maintained in parallel using SemVer and it is possible to apply it using Git Flow (Reference: Post ...
lvf23's user avatar
  • 47
-3 votes
3 answers
166 views

Defining 'First Commit' in Lead Time Metric and Strategies for Small Batches in Deployment Frequency?

I'm try to improve our deliver time from start to end. I read google post about 4key metrics. I have questions that don't find answers in any post. 1- Lead time definition is "The amount of time ...
anilcosar's user avatar
0 votes
3 answers
403 views

Can 1.0.1 be launched right after 1.1.0?

I know that it is common for software to have parallel development in major versions, such as v1 (1.x.x), which can be completely different from v2. Regarding Semver (Semantic Version), can I upgrade ...
lvf23's user avatar
  • 47
1 vote
2 answers
204 views

Git - best practice - push non-runnable intermediate commits

I would like to discuss with you this way about the best way to work with git. We are currently developing software with three people. For version management we use git. The main branch is our ...
Phoenix's user avatar
  • 29
0 votes
2 answers
165 views

Is a 'base' file always necessary when doing a merge?

Are there any algorithms that can do or suggest merges without requiring the "base" file, the most recent common ancestor of the two file versions that we want to merge? Is a manual merge ...
yoyo_fun's user avatar
  • 2,297
0 votes
4 answers
2k views

How to maintain development,testing and production branches when the number of devs is around 50?

Currently my code base has 3 deployments, development : where devs unit test and develop features, testing : where testers run end user verification for the features and production : the deployment ...
a.utfull.day's user avatar
3 votes
2 answers
334 views

How to gain confidence during a large, complex merge?

I recently finished a large merge with many complex conflicts that needed to be resolved. The branches had been separate from one another for several months while different teams contributed to each ...
Eric Schnipke's user avatar
16 votes
10 answers
4k views

Looking for some alternative branching strategies to meet my team's needs

I've recently joined a new company and they've been experiencing some issues related to their branching strategy which causes untested code to be released inadvertently. We have three branches of ...
Ogen's user avatar
  • 293
0 votes
1 answer
86 views

Where to keep assets for documentation generation as to not clutter the main repository

I have a large C++ project I'm hoping to release publicly soon (it is currently an internal development at work). We have a large auto documentation setup which uses doxygen and sphinx, however our ...
Chris Gnam's user avatar
2 votes
4 answers
785 views

Understanding whether 'rebase' can be used in a team environment?

I'm new to Git, having worked with TFS for nearly 20 years, and I'm currently trying to get my head around "rebase". I broadly understand what it's doing, but there are a couple of caveats/...
Andrew Stephens's user avatar
0 votes
2 answers
191 views

Workflow for Writing Database Migrations for a Team

I am wondering what some possible workflows are for writing database migrations for a team of developers. We seem to run into a problem where one person writes a migration, names it and gives it a ...
MadPhysicist's user avatar
2 votes
4 answers
2k views

How do you deploy and test a hotfix repo branch in different environments, Git Flow variants

I have done thru where do bug fixes go in git flow and the git flow and github flow pages. There are scenarios many times when we need to show demo of new functionality and on same day fix issues of ...
tgkprog's user avatar
  • 607
7 votes
4 answers
548 views

How to collaboratively resolve conflicts in Git?

We are working on a big feature, because we don't know how to make it any smaller. I got to a point, when I need to merge my changes from our feature branch into develop branch (we're using Git Flow), ...
Michal Krasny's user avatar
3 votes
2 answers
2k views

Branching strategy for multiple team working on same repository

I am trying to come up with a branching strategy. We have two teams working on the same product which is kept in one repository. Both teams have different release plans and if both teams merge on ...
Totoro's user avatar
  • 139
0 votes
1 answer
169 views

Where should research and production code reside in git?

We have research code that consists of Jupyter notebooks and large data files. At the same time, we also have production code that consists of Python source and CloudFormation templates. There is ...
Chewers Jingoist's user avatar
1 vote
3 answers
183 views

What approach should I use for auditing config changes to achieve similar functions as Git blame?

We are storing our configuration files in S3. Each file is a JSON file. When config changes, the old file is backed up and a new file replaces it. These happen behind a service, where it also ...
z11i's user avatar
  • 111
0 votes
3 answers
362 views

Is there any advantage of pushing branches to GitHub without an associated PR?

I work with other Software Engineers on a web app product. Also, the source code is hosted on GitHub. There is a behavior pattern that I do not understand. Some co-workers push branches (adding ...
Pedro Delfino's user avatar
0 votes
1 answer
171 views

What is the correct way to deal with Pull Request updates concerning an interface with a Continuous Integration script: rebase or merge?

I work with other Software Engineers on a web app product. Also, the source code is hosted on GitHub. Recently, there was an introduction of a Continuous Integration procedure enabled by a script ...
Pedro Delfino's user avatar
0 votes
2 answers
164 views

A feature branch on top of another feature branch (dealing with PRs)

As shown in the following image, I have two different branches with their corresponding PRs (PR1 and PR2). The top arrow is the develop branch. PR2 is build on top of PR1. PR1 is build on top of ...
mgNobody's user avatar
  • 119
0 votes
2 answers
218 views

If "others have modified components since you checked out the system", what would you do?

In Software Engineering by Pressman: The steps in continuous integration are: Check out the mainline system from the version management system into the developer's private workspace. Build the ...
Tim's user avatar
  • 5,435
-1 votes
2 answers
111 views

Template Source Control Repository

What is the best practice, for creating a template repository, and then creating n projects based on that template? With "template" I mean: Let's say the template site is x. So x is a site ...
Divan's user avatar
  • 339
1 vote
1 answer
1k views

Branching strategy for developing multiple features at the same time

We are doing a mobile app development and currently, we have Dev - UAT - Staging - Main branches. We branch from the Main branch as feature/fA for feature development. We do our development in that ...
Kdaydin's user avatar
  • 135
0 votes
0 answers
76 views

GitLab repo architecture checks: on server or in CI?

I am currently seeking a solution to run sanity tests on my GitLab repos architecture. There are more than 20 repos in a GitLab group. My idea is to create a "Health Check Repo" (HCR) that ...
vvvvv's user avatar
  • 129
4 votes
3 answers
6k views

What is the difference between trunk based development and gitflow?

I've been searching the internet and I can't find a good question to this so I believe I have a fundamental misunderstanding on what they are. Is the only difference that in gitflow there is a release ...
RoboShop's user avatar
  • 2,760
2 votes
3 answers
398 views

How to maintain multiple release branches simulateously (git)

This question has probably been discussed to death, but I don't feel like I have a good answer. I work at a company where customers are on different versions of our product. When a bug is found, we ...
Travis Parks's user avatar
  • 2,515
4 votes
1 answer
316 views

How to label backwards incompatible changes which change the API but don't add a feature?

I have a project in which I'm the sole contributor, there isn't a stable API yet and I'm constantly refactoring code, but I still try to denote breaking changes whenever they do happen. Recently ...
Clara's user avatar
  • 53
1 vote
0 answers
34 views

When implementing Branch For Release in Trunk Based Development how should version info be updated? [duplicate]

I am currently implementing a Trunk Based Development workflow utilizing Short Lived Feature Branches in a project I am working on. Recently I have realized my release strategy is less than optimal, ...
Thomas Brown's user avatar
0 votes
1 answer
1k views

Should tags be introduced on commits still in Pull Request branches outside of main/master branch?

Context: I am working on a project in which people use tags on commits yet in branches waiting on the Pull Requests queue of GitHub. This means they are non-merged to the main branch yet. The problem ...
Pedro Delfino's user avatar
-1 votes
2 answers
2k views

Can I split a feature branch and then merge it back to the origin master branch without any issues?

I'm working on a project where the master branch is protected. Usual workflow: Always create feature branches off master and then send PRs. Once that has been merged into origin/master, I can pull it ...
rsn's user avatar
  • 117
1 vote
3 answers
208 views

Low maintenance approach to handling versioning and git

What is a good way of handling version bumps in git history? The best approach that I've found so far is something like this: Version is specified in one of the source files (e.g. Python's __version__)...
Glanking's user avatar
0 votes
0 answers
174 views

Git - nest an optional repository inside a repository

I have an existing repository (which is organised using the standard Golang project layout) cmd/ bigproject/ main.go internal/ ... pkg/ ... vendor/ ... What I would like to do ...
Jivlain's user avatar
  • 373
3 votes
4 answers
501 views

Releasing untested features using git flow

not quite sure how to put that into the title, because the issue is a bit specific. Basically, we're using gitflow (slight variation of it) in our application. So, this means we have the following ...
Musterknabe's user avatar
0 votes
3 answers
750 views

Is there a design reason why Git commits only store pointers to their parents, not children?

Git commits contain pointers to their parent commit(s). Is there a reason why they don't also contain pointers to their child commits? I get that there's a problem of data duplication, in that you'd ...
Lou's user avatar
  • 336
18 votes
7 answers
9k views

When should I create another branch in git and when should I use the main branch?

I am working on a project on my own and I am using git just to keep track and to get used to a team environment. When should I commit on the main branch (if I should at all), do I need to create a ...
BeeFriedman's user avatar
2 votes
2 answers
516 views

Shared Branch while working on User Story

Two developers (front-end and back-end) are working on one User Story, while the front-end is dependent on the work of the back-end. What is the best way to handle this dependency regarding the ...
mdiebels's user avatar
-1 votes
1 answer
972 views

Best practice for git repo locations

I started my first job as a dev about 3 months ago, at a very small company where I'm (currently) the only developer, and I've been setting them up with git. Their codebase is a bit all over the place,...
confused_nomad's user avatar
3 votes
2 answers
4k views

Git-flow: How to create a hotfix release when there are future releases?

This question is related to Vincent Driessen's Git Flow branching model. To better describe my problem I would like to use one of Mr. Diressen's great pictures in a slightly modified way: The ...
buhtz's user avatar
  • 171

1
2 3 4 5
24