Questions tagged [git]

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

45 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
5 votes
1 answer
1k 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 ...
  • 167
4 votes
0 answers
719 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 ...
3 votes
0 answers
519 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
3 votes
0 answers
107 views

Can/Should I make an automatic installation of new python libraries after a git pull?

Imagine the following situation: I'm working on a python project, and I install the library antigravity with pip. I add the function fly() which uses the library, and I commit and push the changes. ...
3 votes
0 answers
127 views

How to remove and archive source code in a git project so it can be found

I'm working on a project where requirements are rapidly changing, therefore some functionality is built then rapidly replaced by other functionality. I'd like to remove some functionality from the ...
  • 280
2 votes
0 answers
378 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
2 votes
0 answers
43 views

AWS codepipeline deployment

I currently have an AWS Codepipeline that is setup to automatically pull an Express, NodeJS API and deploy it with Lambda and API Gateway. It pulls the code from my GitHub repo production branch and ...
2 votes
0 answers
47 views

Wordpress and git, (using WPE), how do you incorporate database changes into the workflow?

We use WordPressEngine and want to have multiple developers and multiple branches using git. One challenge is how do we incorporate the database into the workflow? Should we take a sql dump and ...
2 votes
0 answers
79 views

What impact does the ancestor file have with git merge-file?

Consider this example command line session... $ git --version git version 2.19.0.windows.1 $ echo "header" > ancestor.txt $ cp ancestor.txt left.txt $ cp ancestor.txt right.txt At this point, ...
  • 611
2 votes
0 answers
2k views

Multi module Maven project or separate repositories?

Consider the following architecture: Application A Application B Commons-Util A and B share a lot of functionality. That's why we plan to extract the shared code into a commons library. I am aware ...
2 votes
0 answers
182 views

Implementing redundant GIT backup scheme

I want to push a local repo to multiple remote GIT repositories to achieve redundancy in my backup scheme. So, let's say I plan to use Github and BitBucket to host my repositories. I have two ...
  • 189
2 votes
1 answer
745 views

Multiple git committers on same repo and machine with forwarding agent

I have a remote machine where multiple developers work on the same repository. We use gitolite and SSH keys to manage git access. As for now we code on the local machines, commit, push, pull remotely ...
  • 47
1 vote
0 answers
122 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 ...
  • 45
1 vote
0 answers
278 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 ...
1 vote
1 answer
223 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
0 answers
167 views

Gradle + Git - enforcing a version change upon merge to master

I am leading a team of developers creating a Java library. We are following the standard Semantic Versioning model. The code is versioned with Git. Artifacts are built and pushed to an artifact ...
  • 259
1 vote
0 answers
63 views

External standalone cpp code in my project

I've inherited a project that has a codebase in src/, but it also has precompiled binaries of dependency software in bin/. I would like to move away from having precompiled software as part of our ...
1 vote
0 answers
103 views

How to setup git repository subfolder mirror?

It is known that Laravel Framework consist of library collection named Illuminate. In which some libraries are mirrored into separate repositories, right under https://github.com/illuminate/ namespace....
  • 127
1 vote
0 answers
73 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 (...
  • 111
1 vote
0 answers
930 views

VS2015 & Git Submodules

We have a few projects in my organization that are being developed in parallel and I have found that they are increasingly using similar Utility/Logging/Etc functionalities that they have as separate ...
  • 387
1 vote
0 answers
118 views

Git Repositories updated

I would like to keep two Git repositories updated. First one, is GitHub open source project that gets updated frequently. Second one is a private held Git Repo located other than GitHub. This one ...
  • 111
1 vote
0 answers
157 views

Version Control for several projects

I've found several things about how to manage a data science projet with GIT but I didn't find something about how to manage a set of projects. In 90% of the case I'm working alone and over the ...
  • 111
1 vote
0 answers
300 views

Git collaboration with pull request in a company

I am thinking of a way to do collaboration between coders in a company, suppose we have 2 type of servers: Production and Staging. Now we want to review all changes going to Production via pull-...
1 vote
0 answers
201 views

GitShell, how can I not type the username and passwords?

Open the CMD, and I should type the password and usename? In the GitShell opened by shortcut, I don't need to type the username and password. Related is here: https://softwareengineering....
0 votes
0 answers
64 views

GitLab repo architecture checks: on server or in CI?

I am currently seeking a solution to run sanity tests on my GitLab repos architecture. There are more than 20 repos in a GitLab group. My idea is to create a "Health Check Repo" (HCR) that ...
  • 129
0 votes
2 answers
178 views

Can I split a feature branch and then merge it back to the origin master branch without any issues?

I'm working on a project where the master branch is protected. Usual workflow: Always create feature branches off master and then send PRs. Once that has been merged into origin/master, I can pull it ...
  • 119
0 votes
0 answers
70 views

Git - nest an optional repository inside a repository

I have an existing repository (which is organised using the standard Golang project layout) cmd/ bigproject/ main.go internal/ ... pkg/ ... vendor/ ... What I would like to do ...
  • 373
0 votes
0 answers
45 views

How to properly follow a forked git repository?

We have to fork a repository and keep it up to date, with adding changes here and there. The important branches are remote/1.0 and remote/1.1 The workflow currently used is to fork the repository, ...
0 votes
0 answers
95 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
0 votes
0 answers
201 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
1 answer
107 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
4 answers
472 views

Rewind commits to new branch in git

I have three branch on my git tree. master contains validated source version, develop contains staging versions, then I have some feature branches. For now, I have the current strucutre; The numbers ...
0 votes
0 answers
164 views

Separating Development and Deliverables with Git/Github

I am looking for some advice on the best way to manage my development worflow. I have been using git locally to track development and have recently uploaded a couple of private projects into Github. ...
  • 109
0 votes
0 answers
314 views

Git feature branch workflow for multiple branched features

I wanted to summarize a quick discussion we had in my stand-up today. We have a big feature branch merge coming up in our system. We are replacing the old live, system (branch master) with a redesign (...
0 votes
0 answers
2k views

What are best practices to synchronize multiple git branches?

For example, Gitlab indicates that the develop branch is behind master: Example 1 Example 2 One could make a merge request from master to develop, but as there are no code changes it seems ...
  • 488
0 votes
0 answers
107 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
0 votes
0 answers
231 views

Version Control & Deployment on Large Ecommerce Site

I am currently Front End Dev for a large ecommerce store and I'm wanting to switch the entire site to a Version Control System (Git) and Deployment service (Beanstalk). I'm having trouble ...
  • 101
0 votes
1 answer
108 views

Knowing what will get released in gitflow

We are a web SaaS company using gitflow and JIRA. As we are 'done' (QA approved) with a feature, we move the story/ticket forward in Jira to a 'done' status. At that point we wait until it gets ...
-1 votes
1 answer
61 views

How to maintaine a local git fork from a repo with many branches

I'm using a public git repository and adjusting it to my specific needs, meaning that the changes are not worthy of being merged upstream. Repo is in github (upstream), and we maintain our own git ...
  • 123
-1 votes
1 answer
932 views

Implement Branching strategy in DevOps for Multi-Tenant application

I have asked this question on Stack Overflow and I got a suggestion of posting it here for better suitability. So here is my question : I am new to DevOps, and i have a solution with Umbraco as CMS, ...
-1 votes
1 answer
61 views

Should I further branch off of a new branch or continue developing an additional feature in the same branch?

I have a branch (dashboard) which I am developing a new feature on. To make the example easy to follow, I am developing two separate functions (function1() and function2()). They work how I want ...
-1 votes
1 answer
205 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 ...
  • 125
-1 votes
1 answer
201 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 votes
1 answer
112 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 ...
-3 votes
1 answer
186 views

Version control problem

I heavily use Excel and CSV at my workplace. File 0 Excel File The initial file is an Excel file. Let's call this File 0. This may or may not change with time depending upon the requirement of the ...