Questions tagged [git]
Git is an open-source DVCS (Distributed Version Control System)
1,119
questions
1
vote
1
answer
104
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
132
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,463
0
votes
1
answer
71
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
113
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
1k
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
81
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
236
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
174
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
235
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
121
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
350
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
0
votes
3
answers
96
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 ...
- 117
1
vote
1
answer
223
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
2
answers
327
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 ...
-1
votes
2
answers
342
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 ...
- 123
0
votes
1
answer
1k
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 ...
- 203
0
votes
2
answers
110
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 ...
- 21
2
votes
1
answer
267
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 ...
- 137
2
votes
4
answers
222
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 ...
- 241
0
votes
0
answers
132
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 ...
- 109
0
votes
3
answers
178
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 ...
- 27
0
votes
1
answer
165
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 ...
- 169
1
vote
1
answer
155
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 ...
- 143
0
votes
2
answers
72
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
3
votes
3
answers
513
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 ...
- 954
-2
votes
1
answer
436
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 ...
- 107
8
votes
2
answers
801
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 ...
- 194
5
votes
1
answer
546
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 ...
- 167
0
votes
1
answer
80
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 ...
- 3
7
votes
2
answers
371
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 ...
- 187
-4
votes
1
answer
46
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 ...
- 95
3
votes
0
answers
414
views
GitHub flow: how do I test my changes that cannot be tested locally?
I am trying to start using GitHub flow in my project. I like that it is simple and, more importantly, it encourages continuous delivery.
However, there is one thing about this flow that I cannot ...
- 149
-1
votes
1
answer
215
views
Git merging on an existing PR
wanted to know if this is possible.
Consider we have Branch A that is in a PR waiting to be merged. On a local branch, I pull the changes made in branch A and now they exist in my branch B. I ...
- 11
1
vote
1
answer
2k
views
What's the best practice to use semantic-release to update version number in a node.js or frontend project
I'm using semantic-release to auto find out the next version based on the git commit. It's working fine with creating new version, upload to npm and create new git tag. And semantic-release is ...
- 129
0
votes
1
answer
165
views
Can I add an entire git repo inside of a git repo without submodules?
I'm making a git extension. It's in its own git repo. To run tests, I have created several test repos which are used by my project. Currently they are submodules of the main repo.
I am dissatisfied ...
0
votes
1
answer
203
views
Suggestion a Safe Strategy to Migrate to Monorepo
Consider a bitbucket project with 3 separate repos, A, B, C. These form the components of a microservices application, APP. We'd like to safely try out a monorepo pattern and see if it streamlines ...
- 131
-2
votes
1
answer
78
views
Best Git branching strategy plan CI/CD for kafka platform development
I'm working on a Kafka platform development project, the team is keeping all the code in master with no branches, next moving to QA, Stg, Prod. If in between these stages if they don't need any ...
- 1
4
votes
3
answers
247
views
Best Practices for modifying shared Git history?
Background:
Our group of 10+ engineers all share a Git Repository. In the past, someone has checked in binaries that have caused the size of the repository to grow from ~10 MB to ~10GB. These ...
- 193
9
votes
2
answers
542
views
Disadvantages for having completely different codebases in different git branches
One senior member of my team setup a new git repository for our product we are working on, since we are migrating from SVN to git. Our product consists of different software components that are ...
- 111
-2
votes
1
answer
3k
views
Why shouldn't I merge two feature branches in git-flow?
When there are two feature branches that has some dependencies, and they are work in progress, but some piece of code want to be shared, why shouldn't I merge a feature into another?
- 127
-2
votes
1
answer
85
views
How to handle dependencies between branches in git-flow?
I've been working on feature_A while another dev works on feature_B. Now, the other dev needs a small functionallity that's implemented in my feature_A, but I've not finished the whole feature itself. ...
- 127
5
votes
3
answers
533
views
Performance implications of a game project monorepo on *modern* Git
First off please note, I’m fully aware that Git has historically been terrible at dealing with large binary files and very large repos; there are at least a dozen questions on SO that deal with large ...
- 241
4
votes
2
answers
2k
views
How to deal with multiple release/hotfix branches in Gitflow?
I'm implementing Gitflow at the company I currently work for and everything is going pretty well. I'm just not completely sure if I'm dealing with more than one release on the pipeline at the same ...
0
votes
3
answers
289
views
using git, bringing old tagged releases up to date
I have a git repository with a long history. Releases were tagged along the master branch over time.
If a user wants to go back and check out an old tagged release, they do not have the advantage of ...
2
votes
2
answers
372
views
Migrate an SVN repository (that was previously the merge of 2 repositories) to Git while retaining history
Background
I am trying to migrate an SVN repository that was formerly 2 svn repositories (but within the same svn server, so sharing commit numbers), which was then combined.
So initial state (two ...
- 679
1
vote
2
answers
159
views
Prove that Feature Flags turned off Items in Production Environment
We want to implement Feature Deploy Flags, so Development Application Environment will have a new Product feature Toggled on. And Release and Production Environment Webpage, it is turned off.
Its ...
user377748
8
votes
1
answer
10k
views
Should frontend and backend be on separate GitHub repos?
We are new to git, but this fundamental question needs to be sorted out before we can begin. It's two devs who have been working standalone for a while. Now the time has come to adopt git (at the ...
0
votes
1
answer
28
views
Sould I .gitignore build output for a WordPress plugin?
Our builds are not binary by nature of WordPress PHP/JS, merely combined and minified. But they can be re-created by any developer easily and I feel like they shouldn't be version controlled but I ...
0
votes
1
answer
278
views
Can Feature Flags replace Hotfixes in Devops?
When using a git strategy similar to gitflow, can feature flags totally replace the Hotfix Release branch process?
When seeing bugs in production, we first make the change in the develop branch and ...
user375708