Questions tagged [git]
Git is an open-source DVCS (Distributed Version Control System)
1,089
questions
1
vote
2answers
93 views
Git tags as an alternative to --no-ff in gitflow
In https://nvie.com/posts/a-successful-git-branching-model/, Driessen suggests using the --no-ff flag to make the history of commits for the dev branch clear. This is an easy flag for individuals on ...
0
votes
2answers
82 views
Git branching model that support small changes and downstream dependencies
Challenge:
I am implementing a microservice/app/applet.
Several features will be delivered
As things develop later features rely/depend on earlier Pull-Requests (PR)
Developer resoruces are finite, ...
3
votes
1answer
88 views
how to easily merge future updates after cherry picking commits. - Or merge a specific commit first?
A particularly nasty bug just happened to our software. (JS/react something was preventing onclick from firing about half the time - turned out a constant rerender was happening). This wasn't really ...
1
vote
1answer
85 views
Git workflow - when exactly do you need dedicated branch for release
I have worked with Git workflows where we release from dedicated branch specifically used for release (e.g. Gitflow's master/main branch). In such workflows, there will be multiple (at least 2) long ...
0
votes
1answer
103 views
Best GIT approach to educational project
I am working on a course design and I'm preparing the project that the students will have to work on all along the course.
Each student will create a GIT repository a the beginning of the course and ...
12
votes
3answers
4k views
What is a non-merge commit?
In the announcement of Linux 5.15-rc1 Linus said:
At only just over 10k non-merge commits, this is in fact the smallest rc1 we have had in the 5.x series.
What is a non-merge commit? What's the ...
1
vote
3answers
154 views
Etiquette / Leadership / Sharing Best Practices - How much should I try to influence?
I recently joined another team part time where I kinda know several of the people, and they know me for my design work mostly, but I'll be doing design and some development with them. There's a lot of ...
1
vote
2answers
76 views
Git dynamic merge branch
I'm currently using git to manage a "modpack" for a game, the modpack is made of several smaller mods, each of which is a branch. Some mods may also depend on, potentially multiple, other ...
1
vote
1answer
175 views
How can I write good Conventional Commit-style commit messages for one feature over multiple commits?
If I am working on a single feature, I would usually commit multiple commits. Should every commit start with feat? Or should only 1 commit have the type of feat and use a different type for the other ...
4
votes
2answers
206 views
Introducing a code formatter to an existing code base with running branches
We have an existing code base in Python which doesn't yet use any code formatting tool. Now we have settled on YAPF as a tool and also created its configuration file. To me it is not clear how to ...
0
votes
1answer
182 views
Why are several versions in production a key to choose GitFlow over GitHub flow?
I've seen in many places, one of them here (and also in the guiding questions of GitVersion) that, when coming to determine whether or not to use GitFlow, one key consideration is whether or not I ...
1
vote
1answer
90 views
GitFlow question about develop and hotfix branches
I've read the canonical article about GitFlow by Vincent Driessen, and there are 2 things I'm not sure about:
In the big diagram in the beginning of the article:
In the line of the develop branch, ...
0
votes
1answer
171 views
Why is master branch important in GitHub flow?
First let me phrase my understanding of GitHub flow before asking the question:
In GitHub flow, we have a main branch, and feature/topic/bugfix/whatever branches branching off that main branch. Once ...
4
votes
9answers
416 views
Should I be enforcing lint rules on feature branches?
I am working on a project and I typically setup precompile git hooks for things like linting and testing. I recently had some consultants we use complain about requiring lint on every commit. Their ...
0
votes
1answer
119 views
Trunk Based Development and Long Lived Release Branches
My very large team is following trunk based development with many short lived features branches, trunk, and a release branch for when we create release artifacts. This is a team that keeps the release ...
7
votes
1answer
270 views
How do you use version control systems while you are in a long design spike phase?
In some recent projects, I found myself having some longer spike phases in which I build many cheap prototypes and explore different design decisions, long before I would consider my code of ...
-2
votes
1answer
104 views
Git semantic commit versioning for file deletions
What commit type should I use when I'm deleting files from a repo?
I have seen several types over the internet, but none talk about file deletions.
Possibly the closest options that come to mind are ...
0
votes
1answer
114 views
Git structure for Azure Function Apps that accounts for shuffling functions
I have a suite of python Azure Function Apps that all together make up an integration, each containing multiple functions:
FunApp1
func1
func2
SharedCode
FunApp2
func3
func4
SharedCode
FunApp3
...
1
vote
1answer
86 views
legacy refactor and churn
I am trying to work on finding the following metrics
New Work - totally new code which does not replace other code.
Churn - code that is rewritten or deleted after being written
Help Others - where ...
2
votes
2answers
129 views
How can avoid I merge conflicts on an interactive coding tutorial for beginners?
I am working on a JavaScript tutorial series for someone who has no experience coding.
The format of the series is that it is a public Github repo. Each lesson is a README.md markdown document, and ...
0
votes
1answer
63 views
Modernizing a legacy source control / deployment infrastructure
I've got a large, old application with a clunky, extremely manual deployment process (essentially, tribal knowledge combined with random scripts / build jobs scattered across servers). The application ...
0
votes
0answers
103 views
Sole software engineer for a small company. How to handle deployment?
I'm the only software engineer for a small company and I want to make my deployment process more robust because I can't work away from my dedicated workstation with my current process. I only make ...
0
votes
1answer
260 views
How to structure Python modules so they are accesible from different submodules
This is somewhat similar to this question but I could not find a solution there.
I have a project that I've worked on over the past 4 years. I started without any Python knowledge and learned as I ...
-2
votes
1answer
70 views
What is the "workflow," like when managing a custom GIT fork?
I'm thinking of creating a custom fork of a program to customize and fit my day-to-day uses a bit more, and was wondering how I would manage the fork to keep up to date with bug fixes and stuff in the ...
4
votes
1answer
186 views
Alternative for C# Library distribution within an Organisation
I am looking for advice on how to manage shared code between several projects more effectively.
Currently, we have several applications that use the same common backbone of infrastructure code, from ...
1
vote
0answers
59 views
Which commits should I use when calculating DORA "Lead time" metric?
As per the "Accelerate State of DevOps 2019" (you can download it here) they define lead time for changes as:
how long does it take to go from code
committed to code successfully running in ...
0
votes
1answer
99 views
What to do with a big pull request for just one feature?
We are using git flow as a branching model, and we have a feature ticket that conceptually is a pretty small feature in the software management tool, in this case Jira.
The thing is that the code on ...
0
votes
1answer
55 views
AWS CodeCommit - duplicate test and production repos
I am using AWS CodeCommit with CodePipeline. I have
two totally separate AWS accounts, one for test and one for production,
identical Code Pipelines setup in each account, each with a corresponding ...
0
votes
1answer
444 views
How to organize multiple microservices in a GitHub repository?
I am setting up a Github repository for a project that will have multiple Microservices.
I have created a sub-directory for each microservice under One Repository.
ProjectRepository
\Services
...
3
votes
5answers
329 views
Can we use Git as an additional tool to better estimate maintenance effort?
I'm working with a codebase that is almost 4y old, just a little under 2000 source files and roughly 100 developers have committed to it.
One of our third-party dependencies is not actively maintained ...
0
votes
3answers
94 views
How do I create a second App in git where only a few files throughout the Tree are different from the first app
I will have to create a second app based on the first app. The second app shares 98% of the code (Some of the UI is different). I am wondering how to set up the second app without creating a merging ...
1
vote
1answer
211 views
How to maintain well structured code and latency optimized code together?
I'm working on a c++ data analysis project. My workflow goes like this
Analyze the data and build models
Optimize the code for latency, to deploy for production
goto 1
Step 1 has lots of machine ...
-3
votes
2answers
144 views
Correct standard to do a pull request when the local branch is outdated against the remote repository
The scenario is the following:
For a project, such as Spring Security available on github, the following is accomplished:
forked and cloned
git remote add upstream URL-Remote-Repository
git fetch ...
-2
votes
2answers
178 views
How to proper deal with fixed bugs in feature branches
It could sound trivial, maybe it is.
I have a new feature branch (say newfeaturebranch, branched from develop), but during the development a new bug is found and fixed in develop.
The bug is found to ...
1
vote
1answer
211 views
Git repository with multiple projects that share code
I have some projects that share code.
This is my folder structure:
Workspace
+-- Libs
+-- Project_A
+-- Project_B
+-- Project_C
Project_A, Project_B and Project_C use code from directory Libs. I'm ...
0
votes
2answers
61 views
first basic git setup: solo dev, shared hosting, side project websites - how many repos, and which is main?
tl;dr: correct way to add git to existing website project with dev subdomain on same shared hosting server?
I have some side project websites. They're all on shared hosting. I've never used version ...
1
vote
1answer
173 views
Which git workflow for micro-services and testing
I would like to know what best practices exists out there with regard to micro services, CI/CD, testing and Git workflow, especially the way of working given the constraints that
a) nothing should ...
2
votes
4answers
145 views
How can I keep track of which existing lines of code/text have passed some new review?
Firstly, this is a really tough topic to do searches for because you get a wealth of information on “code review”, which is different from what I’m referring to here. That normally refers to ...
0
votes
0answers
83 views
How to maintain and deploy a poc (Proof Of Concept) version of an app?
In our organization we sometimes have to create a poc (proof of concept) to either validate or invalidate the way to go. Currently we're having a discussion around how to embed this within our ...
0
votes
3answers
140 views
Are Git repository and software repository same things?
What I've read
A Git repository is the . git/ folder inside a project. This repository tracks all changes made to files in your project, building a history over time. (Source)
Repository: A collection ...
0
votes
1answer
71 views
Managing Documentation / Source Control for a Full-Stack Application Across Multiple Repos
TL;DR
I have a moderately sized/complexity web application (Angular 11) in one repo and a standalone REST API (.NET Core 3 / C#) in another repo, and am trying to figure out the most efficient way to ...
1
vote
1answer
145 views
Commits vs tags for the solo developer
I've been a solo developer using git for years and haven't yet used the tagging feature. Typically I'll create a "new_feature" branch, make several commits, then merge back to my master ...
0
votes
2answers
63 views
Is this Git flow suitable to manage merges and deployments?
We have prepared a Git flow with teammates, and I wonder if it is sustainable. We want to keep committing on both dev and feature branches. Also, we we want to avoid facing with conflicts during ...
3
votes
3answers
282 views
Avoid "Updated version number" commits
I have softwares whose version number are stored either in a versionned commit file or in the code (main header file for example)
Because of that before every release we have to update the version ...
-2
votes
1answer
180 views
Good idea to use source control with my Lambda functions?
So, I have this legacy project I am starting to hump into with my team. This is a AWS Lambda Python application (a bunch of Micro-services that inform various front-ends). So, when I asked how they ...
6
votes
2answers
504 views
Should Visual Studio specific files be excluded from version control?
I work on a number of code projects, some open source and some not. Many of these projects are intended to be cross-platform, most often running on either Linux (my natural habitat) or Windows and ...
4
votes
1answer
157 views
Confused on Git workflow and role of dev environment/branch
I work in web development and the team I work on is growing so I see the need to hammer out a more formal Git workflow. We have a process down that is working for now but it's starting to cause more ...
0
votes
1answer
47 views
Distribute commit files between different repositories
I am not sure if what I'm asking is even possible (or desirable, for that matter), but we were wondering what would be the best way to handle SQL changes to a Database schema, when this schema is ...
7
votes
2answers
333 views
The "real and effective" GIT CI/CD strategy
I've started in this new company a few weeks ago, this is the CTO CI strategy:
Current: Developer team has the repo prod/master and they merge everything into master (no branching strategy).
Once the ...
-4
votes
1answer
45 views
Controlling and managing separate git repos on Azure DevOps for code security
My company is about to onboard some junior devs for the first time, and we want to limit their access to just the presentation layer. As it stands, everything is in one Git repo. The current plan is ...
