Questions tagged [git]
Git is an open-source DVCS (Distributed Version Control System)
1,056
questions
0
votes
1answer
52 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 ...
1
vote
3answers
71 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
36 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 ...
-3
votes
0answers
78 views
Can git be made scalable as a content management system backend?
I'm currently in the planning stage of a new project which is a content management system.
The basic requirements are somewhat straight forward:
Rich text capability ✅
Real-time collaboration ✅
...
0
votes
3answers
126 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
31 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
134 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
55 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
218 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 ...
-3
votes
1answer
75 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
321 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 ...
2
votes
1answer
60 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
41 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
288 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
43 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 ...
1
vote
0answers
116 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 ...
-1
votes
1answer
57 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 ...
1
vote
1answer
275 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 ...
0
votes
2answers
118 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
0answers
47 views
Large regression test suite and version control [duplicate]
I'm developing a software tool with command line interface. Our team has corresponding regression test suite consisting of ~1000 test cases, which is definitely not a huge number. Each test case ...
0
votes
1answer
65 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 ...
-2
votes
1answer
44 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 ...
0
votes
0answers
28 views
Structuring a Multi-platform project
I'm trying to setup a project where there are source code for many platforms
I have two platforms at the moment. Bare metal ARM Cortex-M and Raspberry Pi.
The project would have at least one ...
4
votes
3answers
225 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 ...
9
votes
2answers
396 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 ...
-2
votes
1answer
322 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?
-2
votes
1answer
55 views
How to handle dependecies 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. ...
5
votes
3answers
327 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 ...
2
votes
2answers
294 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
3answers
79 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
2answers
108 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 ...
1
vote
2answers
107 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 ...
0
votes
0answers
16 views
Automatic deployment for separate server client repo (Express + Angular)
I have a web app that uses NodeJS with Express as the backend server and Angular as the frontend framework. The client and server live on their own git repo. The code is hosted on GitHub and deployed ...
3
votes
1answer
1k 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
1answer
25 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
1answer
202 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 ...
50
votes
11answers
8k views
How can a developer overcome their fear of merge conflicts? [closed]
I'm a beginner at collaborative development, I started learning about merge conflicts.
And I have this question.
Is it possible for a developer to deliberately postpone merging because he doesn't want ...
2
votes
1answer
260 views
How do pull requests fit into a development process?
In my software engineering career I have never worked with pull requests. Probably because I only ever worked in relatively small teams (5-16 people) and only on projects that were structured well ...
-3
votes
1answer
95 views
Reverting commits after merge
I am working on dev branch and I merged dev into master so all the commits not appear on master but I am not very confident about some thing. Should I do pull request and then merge or this way is ...
-1
votes
2answers
79 views
Working on a two branches, that are not dependent by business meaning, but dependent by implementation
I have a class Foo with lots of fields and have two tickets to refactor that class.
the first ticket is to rename it to Boo and two move it to another package.
the second one is to rename some fields ...
-1
votes
1answer
87 views
Is there a way to use git with multiple users on a shared computer?
I'm currently a user of a large research compute cluster which has many other users. We all have access to a shared program that is being actively developed and used. Since we are all effectively ...
2
votes
2answers
380 views
Who is the potential audience of a commit message?
I've been taking a course on plain language writing, in order to make my commit messages more readable and understandable.
One of the main ideas in plain language writing is that your first identify ...
65
votes
8answers
13k views
In code review, should I ask to do a refactor outside of the scope in a pull request?
I have been studying the best practices for a code review, and I was wondering what to do in the following scenario:
During a code review, I see potential improvements, but decide that they are ...
0
votes
1answer
37 views
Package management & DTAP: how to keep overview?
We have an application which contains of multiple composer packages.
A default structure of the site is:
src/
application/
vendor/
vendorname/
framework/
filemanagement/
...
Each package has its ...
0
votes
2answers
125 views
What is the relationship between continuous integration and git hooks?
I'm trying to get into the habit of making sure that each master commit to a repository I work on does not break any existent tests. In my current flawed workflow, there are some intermediate commits ...
0
votes
0answers
30 views
How to version k8s yaml files and keep them in sync with the cluster in the cloud?
Intro
When a developer deploy his code, the ci will execute kubectl set image deployment/gcloud-example gcloud-example=stavalfi/gcloud-example:<new-tag>. But the ci won't change the tag in the ...
0
votes
3answers
198 views
Is it reliable to compress database backups with git?
I'm working as an intern at a fund. I spent the last month building a website for internal use, and now I think it's a good time to set up a backup scheme for the MySQL database at its backend. Funny ...
2
votes
2answers
147 views
Proactive git branch conflict detection?
I'm considering creating a new tool, but I wanted to find out if something like it already exists.
The Pain:
Working with many collaborators on a monorepo, conflicts are not possible to detect until ...
-3
votes
2answers
92 views
Gitflow, use code from another feature branch in feature branch
me and a friend are working on a project, and we are both doing seperate things (he does UI, I do some data structure), and his code relies on my code. Right now we have a master, a develop and 2 ...
2
votes
1answer
108 views
Is there a convenient way to include only a particular snapshot of a git repository inside another project?
Update:
I think I may have found one possible solution for this question: git worktree. I'll have to investigate its exact workings a bit more, because I'm not entirely sure yet if it can do what I ...
