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
Join us in building a kind, collaborative learning community via our updated Code of Conduct.

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

114
votes
9answers
14k 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
27 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
143 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
189 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
167 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
25 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
156 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
149 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
30 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
127 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
94 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
181 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
97 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
73 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
384 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
45 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
122 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
101 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
41 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
47 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
270 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
41 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
97 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 ...
3
votes
2answers
101 views

How to organize PL/SQL objects in git [closed]

In our organization, we have several databases. Each of them has lots of schemas with tons of packages, procedure, functions and so on. Now, I wonder what approach is best in terms of organizing those ...
-1
votes
1answer
109 views

What happens when create new brand in Git?

I'm new to Git and SourceTree tool. I don't understand why this happens? My steps: 1. Create new brand, named develop/john/LinksMiddleware/new 2. Stages changed files, for more details there're ...
-2
votes
1answer
63 views

What does it mean that DVCSs allow us to set up several types of workflows that aren’t possible in centralized systems, such as hierarchical models?

Can someone please explain the last sentence of this paragraph about Distributed Version Control Systems: "Furthermore, many of these systems deal pretty well with having several remote repositories ...
1
vote
2answers
183 views

Rewriting software - clone or create new repo

I have a working web app that I version control using Git - call this v1.0. I learnt a lot during that development including some of the mistakes I made. I now want to re-write parts of the code to ...
3
votes
1answer
65 views

git merge or cherry-pick for copying commits from old branch into newer branch?

The previous guy had worked on local clone of LO(LibreOffice) for TB_LR script support during 2015, and now my job is to get all his commits on his branch to reproduce his work on current LO clone. I ...
1
vote
0answers
59 views

How to manage multiple NuGet packages in GitHub and Artifactory?

My colleagues and I are in the process of re-architecting our system. The old system is a ASP.NET monolith using TFS for source control. The new system is made up of ASP.NET Core microservices using ...
1
vote
0answers
100 views

Project structure with git submodules with common dependencies

I have two (and more in the future) Python projects that I'd like to package into a global package in order to import its modules and use them in another external projects in the future. This is how ...
3
votes
1answer
195 views

Converting a very large remote subversion repository to a slimmed down Git repository

I have the pleasure of taking over 14 year old subversion repository that consists of two key elements: 111,000 revisions, about 10% of which are substantial; The repository dump is about 73 GB, ...
1
vote
1answer
64 views

Can features deployed with GitHub Flow disappear from production?

I'm trying to get a better understanding of Git workflows and read this blog post. What happens after a merge to master if another feature is waiting to deploy? The deployment from master is delayed ...
-3
votes
2answers
118 views

Source control with multiple customer-specific repositories

Here is a diagram of how our source control setup is configured. The issue with this setup is how we handle various customers. I would really like to use a different approach than copying the entire ...
2
votes
2answers
62 views

Definition of a feature in GithubFlow model?

I have been using git for a while now primarily on CLi. I am the only person working on this project so far. I just have 1 master branch and 1 production branch. The production branch is named such ...
6
votes
1answer
396 views

Once I did a PR on a repo, should I delete my fork?

I'm working on a free proyect over Github. I fork it, made some changes, did a PR and everything worked ok (PR was accepted). Then I update my fork with upstream, did some other changes, and made ...
0
votes
2answers
511 views

Git One Repo or Multiple? [duplicate]

I know this has been asked a few times but I still a bit confused, People say to have a git repo per project, but I not 100% what "project" means in this context. I am going to have a reactjs front ...
3
votes
2answers
122 views

How to convert multiple Git repositories for related code into proper branches/tags

Background I've recently become the technical lead/senior developer for a small R&D/data science team. I've got a decent amount of non-lead experience in bigger development teams, but I've not ...
0
votes
1answer
45 views

How to handle pull requests merges in a service oriented environment that touch several repositories?

So we have a microservices architecture. Quite often we release features that require changes in several repos simultaneously. What approaches are best for handling this? Ex. Pull Request 1 from ...
0
votes
1answer
489 views

Easily exclude commits on a merge based on some condition

My eyes are destroyed. I am using a screen reader. We are using git as our version control system on our project. We host our own server and use ssh to access it. We put each module under separate ...
0
votes
2answers
277 views

Keep .gitignore clean?

It makes sense to me that .gitignore should only include files that the project has to produce inside the source directory when you run some configuration or build step. All else that pertains to ...
-2
votes
1answer
53 views

Hardlinking Git Repo for Deployment: Possible Downsides?

I've got a production server I'm managing right now, but it's becoming incredibly inefficient to either: SSH into the remote server, and develop server-side Develop on my local machine and transfer ...
3
votes
1answer
53 views

Finding a balance between deprecating repos and deprecating branches

(This question might be overly broad, and it certainly doesn't have a "right" answer.) I am rewriting some small embedded projects for a company. Rather than dive into the pre-existing code, I am ...
-3
votes
3answers
225 views

Can cherry picking really old commit from seperate branch to master cause problems?

Short story: We had an issue, where customer reported some feature they wanted developed year ago stopped working. The problem is, the feature was indeed developed, but put into separate branch and ...
6
votes
2answers
227 views

Release strategy for multiple Git feature branches being tested simultaneously

We have three environments: Dev, UAT and Prod. We use TFS to schedule releases of our master branch into Dev for our internal verification, then UAT for business verification, and of course finally to ...
7
votes
2answers
506 views

Does squashing pull requests break git's merging algorithm?

I'm currently working for a company that uses VSTS for managing git code. Microsoft's "recommended" way of merging a branch is to do a "squash merge", meaning that all commits for that branch get ...
3
votes
0answers
138 views

Multiple Git repos practices for distributed environment

In a nutshell what I need is a simple good practice for multiple (loosely coupled or tightly coupled), git repositories I would love to hear there is a good framework for that, but I have read a ...
1
vote
1answer
86 views

How do I deal with projects within projects in python?

Note I realise this could be subjective question to answer, but I don't expect an answer in the form of "Do this and everything will work out". I am aware there will probably be some decisions to be ...
-3
votes
1answer
70 views

Sharing virtual box / environment?

I am wondering how do big development teams do it, when they all work on one project. Options are: 1 virtual machine in cloud that they ssh into and push updates via ftp ? each developer have ...