Skip to main content
We’ve updated our Terms of Service. A new AI Addendum clarifies how Stack Overflow utilizes AI interactions.
Software Engineering

Questions tagged [git]

Ask Question

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

1,194 questions
Newest Active Bountied Unanswered
Filter by
Sorted by
Tagged with
7 votes
1 answer
510 views

I am in the process of engineering some UML state diagrams to explicitly model the transitions among Git’s file states: TRACKED, UNTRACKED, UNMODIFIED, MODIFIED, UNSTAGED, and STAGED. The diagrams I’...
Alex's user avatar
  • 87
0 votes
1 answer
172 views

I am doing something I haven't done prior, which is that I built a library (that is still in progress as it is somewhat ambitious), and now I am developing an application on top of the "alpha&...
th hh's user avatar
  • 9
5 votes
5 answers
283 views

Working as part of the release team for a sprawling open source project that uses dozens of Git repositories, I regularly run into situations where one or more of the satellite repositories are ...
Peter J. Mello's user avatar
  • 167
1 vote
4 answers
602 views

Given a large Git commit, how can I split it in a "virtual branch" of multiple smaller coherent changes properly annotated with commit messages? How can AI be applied to the task? I like ...
xralf's user avatar
  • 573
1 vote
4 answers
460 views

We are a recently formed embedded software team, having a minor religious war. Please note that we all work multiple tickets at a time, so will always each of us have multiple branches. Some prefer to ...
Mawg's user avatar
  • 4,308
0 votes
1 answer
162 views

I recently came upon the concept of GitOps. One idea that's central to GitOps is the use of static configurations (e.g. Git repositories are the source of truth for configurations). In my distributed ...
natn2323's user avatar
  • 109
2 votes
1 answer
238 views

I have a Node.js application and I want users to be able to develop custom plugins. I have multiple ideas and I am unsure how good they are. I need some tips from more experienced developers. My first ...
MeineHTMLCodes's user avatar
  • 129
2 votes
2 answers
200 views

We currently use the GitFlow process to manage our releases (or so I think) for a native iOS app. Here are the steps we carried out for context: We created a new repo with the main branch We then ...
Shawn Frank's user avatar
  • 121
1 vote
1 answer
153 views

The scenario: I have a web application running in Kubernetes. The web application is managed and updated by Argo CD, which means a Git repo defines the state of the application. Now the new ...
JF Meier's user avatar
  • 700
-1 votes
1 answer
236 views

I may be misunderstanding the GPLv2 license of Git itself, but I thought that "distribution" of a derived work requires the source to be released. According this post, GitHub is running a ...
merlin2011's user avatar
  • 109
14 votes
8 answers
5k views

Working with Git, I’ve often heard that committing directly to the main (or master) branch is generally discouraged. Instead, many teams adopt workflows where all changes are made in separate branches,...
camhsdoc's user avatar
  • 257
2 votes
2 answers
1k views

What are the pros and cons of using cherry-pick versus merge for release management? Background We have a dev branch, and just created a release1 branch from it. Folks will commit relevant content to ...
Jonathan's user avatar
  • 565
4 votes
4 answers
843 views

I have a project with .net core web api backend and angular as front end. I have single repository for both the projects with front end and backend in their own separate folders. I have written ...
Pawan Nogariya's user avatar
  • 223
18 votes
7 answers
5k views

So, in many software you can do that easily using the mouse: Although very useful, they aren't in chronological order anymore. Is there anything wrong in doing that?
aybe's user avatar
  • 955
0 votes
1 answer
95 views

I want to adopt trunk based development for an opensource product and but I am not sure how it can be applied to documentation and build system changes. Feature flags does not help for things that are ...
Arjob Mukherjee's user avatar
  • 101
-2 votes
1 answer
145 views

I am looking to adopt GitFlow for a multi-product repository. This repo contains multiple on-prem applications and libraries. Due to the nature of the products, releases are not frequent and we do not ...
Learner's user avatar
  • 21
0 votes
0 answers
71 views

I have an Amazon ECS service that relies on configuration files that contain business rules. The business rules are changed periodically by non-programmers. Total size of the rules files is ...
Ivan Krivyakov's user avatar
  • 131
-1 votes
2 answers
133 views

I've just completed the first phase of a multi-phase assignment for a course, and it is working fine. However, I didn't use any version control tools like Git during its development. Now that I am ...
mahdiahmadi's user avatar
  • 1
24 votes
4 answers
10k views

I'm developing a personal project that wasn't originally intended to be public (just for me, testing, fun, learning, etc.) This project has grown a bit and become serious enough that I now want to ...
Foxy's user avatar
  • 621
1 vote
1 answer
300 views

I have a CI pipeline that creates snapshot artifacts with constant version numbers after each commit to the development branch. Then the snapshots are deployed to the stages (dev, test) sequentially ...
Theo5423324's user avatar
  • 13
0 votes
2 answers
4k views

Meta maintains all their code in a single repository and initially used Git. Due to performance issues attributed to the repo's size, they consulted Git's team, who suggested switching to a multi-repo ...
just_a_developer's user avatar
  • 37
2 votes
1 answer
479 views

I have a git repo with nested submodule dependencies (see picture as an example). There are duplications because each repo needs to be compiled standalone in a pipeline so that the corresponding test ...
Call of Guitar's user avatar
  • 29
0 votes
1 answer
107 views

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
1k views

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
448 views

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
  • 525
-2 votes
1 answer
723 views

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
1k views

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
  • 791
2 votes
3 answers
1k views

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
  • 41
11 votes
11 answers
8k views

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
  • 891
43 votes
11 answers
11k views

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
  • 551
2 votes
2 answers
825 views

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
  • 139
1 vote
1 answer
852 views

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
2 answers
259 views

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
  • 111
16 votes
5 answers
7k views

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
  • 271
0 votes
2 answers
228 views

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
302 views

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
586 views

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
  • 1
0 votes
3 answers
588 views

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
2 votes
2 answers
396 views

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
  • 77
0 votes
2 answers
234 views

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
2 votes
4 answers
8k views

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 "...
a.utfull.day's user avatar
  • 45
3 votes
2 answers
742 views

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
  • 182
17 votes
10 answers
4k views

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
  • 303
0 votes
1 answer
221 views

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
  • 109
3 votes
4 answers
2k views

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
  • 1,135
0 votes
2 answers
461 views

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
  • 109
2 votes
4 answers
4k views

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
  • 610
7 votes
4 answers
2k views

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
  • 411
3 votes
2 answers
4k views

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
246 views

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
  • 159

1
2 3 4 5
…
24