Questions tagged [git]
Git is an open-source DVCS (Distributed Version Control System)
1,107
questions
2
votes
0
answers
98
views
Better alternative for cherry picking across heavily diverged branches
I'm currently trying to update the linux kernel used in a xilinx SoC, my company has an internal repo/fork of xilinx open source linux with a bunch of kernel drivers for our custom hardware & ...
- 29
0
votes
1
answer
39
views
To update or not to update author dates
How often should we do git comit --amend --date=now [target] especially when editing a commit while rebasing or doing a fixup? If the answer is always, is it OK to let existing commits that follow ...
- 203
-1
votes
0
answers
47
views
How to manage release branch(or canary branch) that need to apply feature change occasionally
We've tried to adopt Gitlab flow with release branch as out team's branch management strategy. The developers just:
to do feature development, they checkout a branch from master then merge it to ...
- 283
0
votes
2
answers
97
views
Workflow for splitting large pull request into multiple reviews
Nobody wants to review a large PR from one go. The issue is to split a (relatively large) feature into multiple smaller PRs. The rules of the game are
This is a single feature, which cannot be ...
- 2,501
10
votes
7
answers
8k
views
What is the best way to record in git which commit is currently deployed to which environment?
We run a deployment pipeline where we build a versioned binary, tag the commit it was built from with the same version as the binary, and then can deploy the binary into arbitrary environments (...
- 225
0
votes
2
answers
109
views
Issue key in every commit message? [closed]
Feature branch names already contain the issue key (ticket number). Should commit messages also contain them?
Pro:
easy to see where a commit belongs to.
better for third-party software tracking ...
- 477
0
votes
0
answers
61
views
Keeping a fork of a repository up-to-date with upstream changes
I have a repository, which is a fork of a public project. The fork contains several additional commits with custom features - nothing fancy. Recently, I have been wondering what would be the best ...
- 109
1
vote
2
answers
126
views
Where to put technical updates in git branching flow?
From time to time you need to do technical updates, like:
Update versions of your dependencies
Update the version of your parent POM, you build tool etc.
Leave out those updates that have a firm ...
- 477
3
votes
4
answers
260
views
Git: Best practices for using updates from one branch in another
My team is working on building a bunch of automated tests for our project. Each automated test targets a "customization" our client ordered to modify an existing website.
The current flow is:...
3
votes
2
answers
129
views
Best way to sync work on a repo between different remote machines
I have multiple VMs set up that have the same repo and with slight differences. I use these VMs to prototype or run different experiments. Sometimes I sync or merge between them and from different ...
- 163
1
vote
5
answers
396
views
How to properly manage bugfixes for released versions in git flow
We follow git flow, see https://nvie.com/posts/a-successful-git-branching-model/
Lets imagine the following situation:
We have a current version 2.0.8 on our prod environment. After a while, several ...
- 243
-2
votes
4
answers
296
views
How can I use git effectively when I'm just starting a project and working on many parts at once?
I've been having the problem that at the beginning of a new project, I'm likely to switch frequently between tasks in a way that (to me) doesn't seem very conducive to small single-concern commits. ...
2
votes
4
answers
438
views
If PRs are not being approved, when do you stop branching off of master?
I prefer to create linear git history, which can be fast-forward merged. This was a technical requirement at my previous job, which used BitBucket and required all PRs to be fast-forward-able. We had ...
- 353
8
votes
3
answers
668
views
Should I gitignore env files in my private repo?
I have some .env files for my backend application and the usual recommendation is to put all .env files in gitignore to not share it in the repo and use something like Github Secrets to store the .env ...
- 329
0
votes
1
answer
640
views
Appropriate naming for (GitHub) repositories belonging to the same project [closed]
I have some issues selecting an appropriate naming scheme for GitHub repositories that belong to the same project. The main package repo relies on additional repos to generate documentation or run ...
- 127
1
vote
2
answers
208
views
How to handle code reviews on a collaborative feature branch
We are using GitHub as our source code repository along with Visual Studio. We are going to start to use the GitFlow branching model, so a new feature request will be branched off and worked on in ...
- 121
1
vote
3
answers
188
views
Storing different configuration for the same application in a repository
I just wonder how do you deal with this scenario. Let's say you have an application that uses configuration files that are loaded right after the application starts. Configuration files store - lets ...
- 119
0
votes
1
answer
76
views
How should I handle production rollbacks and eventual hotfix using gitflow?
I want to implement gitflow but I have a question.
Let's imagine I have release version 1.0.0, it works nicely so I merge it into master.
We deploy and it goes to prod.
Sadly we didn't notice ...
- 103
4
votes
2
answers
496
views
When creating a fix, how does branching off the release candidate branch compare with cherry-picking from master?
When we have bug/hotfix for the release candidate, we branch off of the RC branch and merge that fix back into the RC branch. We also merge (git merge, not cherry-pick) that fix into the master branch ...
- 49
-1
votes
1
answer
30
views
CRDTs and merge conflicts in DB design
I face this problem with software development quite often, but I don't really know the name of this issue. It sounds quite common, though.
Two nodes (a computer and a mobile phone, for example) share ...
- 155
2
votes
3
answers
166
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 ...
- 187
0
votes
2
answers
137
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, ...
- 139
3
votes
1
answer
140
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,021
1
vote
1
answer
192
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 ...
- 137
0
votes
1
answer
104
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 ...
- 119
14
votes
3
answers
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 ...
- 283
3
votes
3
answers
169
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 ...
- 147
1
vote
2
answers
84
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 ...
- 111
1
vote
1
answer
417
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 ...
- 119
4
votes
2
answers
301
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 ...
- 905
0
votes
1
answer
255
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 ...
- 162
1
vote
1
answer
160
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, ...
- 162
0
votes
1
answer
221
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 ...
- 162
4
votes
9
answers
522
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 ...
- 71
0
votes
1
answer
448
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 ...
- 3,248
7
votes
1
answer
275
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
1
answer
203
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
1
answer
232
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
1
answer
102
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 ...
- 141
2
votes
2
answers
131
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 ...
- 2,412
0
votes
1
answer
68
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 ...
- 111
0
votes
0
answers
111
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 ...
- 35
0
votes
1
answer
893
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
1
answer
79
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 ...
- 107
4
votes
1
answer
205
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
0
answers
135
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
1
answer
185
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
1
answer
100
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 ...
- 327
0
votes
1
answer
1k
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
...
- 11
3
votes
5
answers
344
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 ...
- 139