Stack Exchange Network

Stack Exchange network consists of 174 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.

Visit Stack Exchange

Questions tagged [git]

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

0
votes
0answers
15 views

Django: integrating standalone user authentication LDAP/Keycloak?

First question here! I'm developing a web app in Django, until now the built in user management solution has worked out well. Now I'd like users of my web app to get a git repository when they start ...
1
vote
1answer
12 views

how to maintain settings across different repositories

So I have .eslint and .settings (VSCode) files that I would like to be consistent across projects. How would I do this? Currently, I am thinking that I should put them into a repository, which then I ...
0
votes
2answers
123 views

1 commit to 2 branches - what does it mean?

I wanted to check commits to a branch, and I saw that there were commits that appear in 2 branches. Why? What does it mean?
-1
votes
1answer
50 views

Makefile: Dev and Release

In Git, I have a master branch (release) and a dev branch (development) for a C project. In the master branch, I want gcc to only be passed the compiler flag -Os (optimize for speed) and not -ftest-...
0
votes
1answer
54 views

Reusing binary assets using Git

We have multiple projects that are using common binary assets (e.g. images, sounds, 3D models etc.) stored in a folder on a server. Right now, each project adds these assets to their git repository. ...
0
votes
1answer
84 views

Forking in Git - helps with merge conflicts?

We use a branching git workflow, but we have real issues with merge conflicts. None of us are git gurus so we always end up manually resolving the conflicts in an IDE which is error prone. There has ...
2
votes
1answer
66 views

Working with maven and multiple git repositories

We recently migrated from SVN, with most code in a single repo, to git, with most projects in their own repos (about 70 of them). We build about a dozen different apps from this java source. The apps ...
0
votes
0answers
17 views

Golang Modules/vgo - local changes

We are trying to use Go-Modules We have reusable repo : "github/mycompany/funcs" many repo's use this, example : "github/mycompany/eCom/basket.go" A new ticket says : "basket should support export ...
0
votes
1answer
57 views

One person controls only one folder, in a repository

How can I give complete control of one folder to one person, while the rest is in the control of another person. Control means they have the power to approve pull requests and commit to master and ...
4
votes
2answers
170 views

Is there a recommended Git branch strategy for two products in the same repo?

My team has a Git repo for a large service that incorporated a related, but fairly unique, micro-service. We recently decided to separate out the micro-service into its own service in terms of release ...
5
votes
1answer
182 views

Steps to convert multi-repo to mono-repo

What are the best steps to convert multi-repos to a mono-repo? This is what I have so far: for each repo, check out the most recent branch (integration branch, usually) for each repo, copy the repo ...
1
vote
2answers
140 views

Storing config in source control, but a different version for each developer

We have a developer toolchain, governed by a config file. Each developer can have their own version of the config file. What is a good way to store separate versions of that config for each developer ...
4
votes
1answer
186 views

How to have multiple source copies of a dependency in a C# git project?

In our company, we develop information system software in C#.NET, which has client-server-module architecture. Module project does not depend directly on server/client project, but only on shared ...
0
votes
0answers
19 views

npm subfolders and git submodule

So I'm wondering how I should go about this. I have a frontend and a backend that's currently meshed together as one git repository. I would now like to separate them into a front end repository and ...
1
vote
1answer
30 views

Process for archiving binaries from different repos using Git?

Working in the embedded systems space, our products usually require multiple binaries for each of the microcontrollers within a single product. Using SVN previously, we would bundle validation and ...
1
vote
3answers
117 views

Git one repo dependent on another

I have a git repository that is built with one library and during compiling the library is switched for another to get 2 versions of compiled code for 2 different libraries. (different versions of the ...
1
vote
1answer
95 views

How to review hundreds of commits and formalize merge request(s)

At my work every line of code must be reviewed and this review is formalized in a merge request. Now we are a facing a situation were one developer developed a prototype for a new product which is ...
1
vote
3answers
84 views

Waiting on Multiple GitHub PR Merges

Scenario: I fork a project and submit a PR on Feature A, and then another on Feature B. I want to continue working with both features while I'm waiting for the PRs to be merged (theoretically they ...
-1
votes
1answer
32 views

how to merge or update a template repository?

I have a template repository consisting of a folder structure, scripts, makefiles, example files (text templates) etc. The easiest way would be to clone the repo, delete the .git folder and create a ...
1
vote
2answers
123 views

Managing git repository

I don't know if I am over-complicating stuffs but here is our setup. 3 Code hosting servers (QA, Stage, and Production) 3 main git Branches (dev, stage and master) for respective servers 10-15 ...
-1
votes
1answer
99 views

Looking for a good git workflow for new projects with a small team

I work in a small team of developers (there are 3 of us). in the research that I have done, the workflow that most teams seem to follow seems to be as follows a branch is created for a feature and ...
1
vote
1answer
43 views

Benefit of using JIRA issue key in fork based workflow

My team follows the practice of including JIRA issue key in each of our commits and also in the title of a Pull Request. Each developer usually make changes in a branch on his/her own fork and then ...
2
votes
1answer
95 views

How to reduce the chances of getting merge conflicts occurring in two projects of same cloned codebase

I have two applications A and B. Application A was written before application B, actually B was initially the same fork of A thus, each of the application had the same modules and same code in it. ...
1
vote
1answer
105 views

Multiple git users

On GitHub if I want to contribute to another user's repo I clone it, make changes and submit a PR, at which point the owner can choose to merge or not. I am trying to figure out how to create a ...
4
votes
1answer
169 views

Using Gitflow and Semantic Versioning: How to avoid version number conflicts when merging?

I want to use gitflow in combination with semantic versioning. In gitflow, you bump version numbers on every release or hotfix branch. This inevitably leads to version conflicts if a new development ...
213
votes
13answers
34k views

New developer can't keep up with branch merges

I am the new developer - this is my first programming position. My issue is this: We use git - I cut a branch from our develop branch, then I start working on the minor task I've been assigned. It's ...
0
votes
0answers
33 views

Organizing Code Alongside a Large Neural Network

I am using the well documented and excellently maintained RetinaNet implementation in Keras Convolutional Neural Network to support some object detection tasks. I'm building a couple sets of ...
5
votes
1answer
167 views

What to do with historical SVN branches after switching to GitFlow?

I am part of a team that has recently moved from an SVN repository to a Git repository, and have started using GitFlow. As I understand it, this means that in a perfect world, the minimum number of ...
1
vote
3answers
193 views

It is good practice for each project (within a directory) to be split out into its own repository?

I am new to Git and am learning as much as I can about it. The latest thing I would like to know is how to approach this problem: I have a single folder (R) that I initially set up as a Git ...
1
vote
1answer
172 views

How do I manage a development journal?

I am working solo on small development projects on my own time, using Git. For each project, I like to have a development journal which is associated with that project and not associated with other ...
1
vote
1answer
28 views

Workflow for contributing to Python libraries under virtualenv

Let's say that I want to contribute to thislib, which is a Python library that is available as a Git repository. Several applications, such as thislib_app utilize this library, and I want to ...
1
vote
3answers
163 views

Should I commit every change before switching branches or is stashing the best option?

I am new to git and am currently trying to learn as much as I can about it. I think the concept of it is fantastic and extremely valuable to any developer's workflow. I am a data scientist who ...
-1
votes
1answer
156 views

A simple GIT workflow for tiny team

I've just joined a project that a developper has been working on solo for 15 years. This is the first time he's had someone collaborate on a project. I've just convinced him we need version control on ...
0
votes
0answers
34 views

Git aware prompt - last remote udpate

I found that the various git prompt extensions lack one feature, it is to show how long ago the information from remote was last fetched ( with git pull or git remote update for example), so that we ...
1
vote
1answer
139 views

We're having some deployment issues with Git Flow

We support multiple umbraco websites for a client. We have our local dev env, staging and live for each of them. Some time ago we started building and deploying all the websites with appveyor. ...
2
votes
2answers
100 views

Commit code transformations in git

Is there a way of committing code transformations or refactorings in git, perhaps as metadata for an actual commit, so that code editing tools can apply the change as a conceptual transformation ...
5
votes
1answer
187 views

What is considered best practice around using git / VCS's when doing a complete code rewrite?

I am a data scientist who programs in R, but am relatively new to using version control (yes, I know!) and I am still learning lots about it. FYI: I use BitBucket and Sourcetree I understand the ...
1
vote
1answer
92 views

Automatically merging a fork to the master

I am trying to setup a flow in Git but I have no clue on how to start on it. We have a master which will be forked by some teams. When the teams are done, they will issue a pull request to the master. ...
0
votes
1answer
106 views

Can source code, automake and configure files for multiple OS co-exist in one Git branch

I am working on an open source project that should be compiled for multiple operating systems including Ubuntu and Windows. I am working on how to structure the Git repositories and branches for ...
0
votes
2answers
75 views

Is Branching the best option in lieu of forking for git repos

For reasons unknown to me, forking repositories is not allowed in gitlab in our company. The idea was to allow the developer to fork and create a merge request which will then be approved and post ...
8
votes
2answers
428 views

Best practice for sensitive information in source control

I know this topic has been covered quite a lot but I can't find an answer to my specific situation. Currently, I'm using .gitignore to exclude sensitive content and keeping it (config files, etc) ...
-1
votes
1answer
54 views

How, in eclipse do I work with an existing maven project in GitHub without ending up checking my .project file?

I have a maven project in GitHub that I wish to work with using eclipse. I want to keep the GitHub repository clear of any eclipse project artifacts such as the .project file. Is there a way to do ...
1
vote
2answers
177 views

How to split a monorepo accross multiple teams each has access to only a slice of repo?

There is a lot of good advantages in monorepo, we also read that large companies like google and facebook use this tech to keep all source code in single repo. But question is how do you manage to ...
2
votes
1answer
152 views

Git Repository Structure for Interdependent Projects

Note: I've seen several other questions about repository organization, but I haven't found any with this dependency issue Current Structure At the moment, we have several distributions (which must ...
0
votes
0answers
56 views

What binary assets layout is most efficient for git LFS versioning?

Currently my game engine's meta data consists of many small image files, and their filenames are their checksum values, and they change often. This means commits to the repository usually has the ...
1
vote
0answers
50 views

Are squash-merges compatible with the Developer Certificate of Origin?

The Developer Certificate of Origin appears to be widely used in open source at this point, including support at GitHub and use by GitLab community edition. In accepting a pull request, many folks (...
0
votes
1answer
81 views

Can I modify author when get patch from community?

We use GIT to maintain an open source code(GPLV2) for our Application. Sometimes we need to introduce patch from community when find bugs. I wonder to know: Can we modify the author when commit ...
3
votes
2answers
318 views

Do we really need a master branch or can we release straight from a release branch?

Currently we have the following branches: Develop Release 1 Release 2 etc.. Master When we want to cut off new features for a release, we create a new release branch (say release 3). We then only ...
2
votes
1answer
42 views

Best approach for managing program customizations inside DVCS

I'm working on a program developed in different variants: a common basic version and various customizations that not only use different logos and images but also add functionalities. I'm trying to ...
2
votes
2answers
134 views

Measuring File Churn Over Entire Project History in Git

I'm looking for a way to quantify where my team should spend it's time addressing technical debt in our codebase. One idea for this is to measure file churn (edits over time). I got the idea from this ...