Stack Exchange Network

Stack Exchange network consists of 175 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)

1
vote
0answers
28 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, ...
1
vote
2answers
125 views

Applying hotfix to intermediate commit on master

Below is the Gitflow workflow followed, where master branch has the commit history(git tag) of different releases. From release mgmt aspect, we are deleting the release branch after merging with ...
-2
votes
1answer
75 views

Release pipeline - Which artifact goes in production?

Below is the GitFlow workflow, we are using for a project. So, in our project master branch currently has only one git commit with just a Readme file. develop branch is forked from that commit. As of ...
1
vote
0answers
63 views

Reducing dependencies between stories & which branch (GIT) should QA's test on?

Background We have a team of 8 devs and 1 QA (tester) and we're struggling with dependencies between tickets and causing a lot of merge headaches and/or people waiting around for the next bit of work ...
0
votes
0answers
22 views

Code base architecture for one app that has multiple versions with small changes [duplicate]

I'm building a hybrid mobile app that has slightly different versions but share 99.9% of the code. There is a paid and free version, which differ in one function only. Also there is a slight ...
2
votes
0answers
49 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. ...
4
votes
2answers
171 views

How do I merge branches between Develop - Test and Production without moving across 'test' specific code?

I have a web application that has some specific differences between production and test environments. I.e. test email config, test payment config, the word Test written on the home page (useful to be ...
1
vote
3answers
78 views

Do I need to 'deploy' my web project when I can just keep a recent clone of the Master-branch in public_html?

We have git installed on our webserver (via cpanel), but unfortunately no CI- / Deployment-Tools. Would it be good practice just initialise our repository in /public_html/ and push our local Dev-...
1
vote
1answer
96 views

Storing test results in a Git repo?

At my company, we use a distributed pool of virtual machines to run our UI and API tests. These machines are all connected to an onsite server which the pool uses for publishing the test results and ...
1
vote
2answers
83 views

How to deal with multiple features in a single git repository in QA

So I'm running into an issue with us trying to test multiple features in our QA environment at the same time. Essentially, changes are taking too long to get promoted in our CI/CD pipeline. The way ...
0
votes
0answers
41 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 ...
1
vote
1answer
90 views

Sharing a sub-project and some users are git beginners?

We have two teams, each using git, and would like to share a small project between them. Git submodules sounded like an obvious answer until I started searching and found lots of "submodules will ...
0
votes
1answer
56 views

Effective GIT Branching Strategy

I am trying to figure out the optimal branching strategy for my organization. And I have few doubts. We have 3 main environments, Live(Production), UAT (pre-release) and Staging. Similary in GIT we ...
-2
votes
1answer
44 views

Fork 3 repo's into 1 main one

I have a specific problem in git which I havent found an answer to yet. In gitlab I have 3 seperate repos. For my school project the teacher wants me to copy everything into a repo of his and wants to ...
5
votes
5answers
442 views

How do I keep two git projects in sync with each other?

I'm developing a Python library, and I'm also developing some code that uses it. Currently they are in the same git repository, but I want to separate out the library part into a separate repo, in ...
-5
votes
2answers
61 views

Authenticate Git Pulls on a Compromised Machine [closed]

I may have a tough one for you. I have a machine in the wild that is and will probably continue to be compromised. The machine is owned by a user who will be unable to keep it secure. I must have ...
0
votes
1answer
44 views

how to build a stable API product and allow specification per project? [closed]

I am in search of information on how I to manage code in git flow and methodology to test and work with it : I have an API in place to build and manage a product catalog and it was designed around ...
2
votes
1answer
69 views

Git branch management vs deployable environments

I am looking for a git branch management model that would be used easily and would allow for Continuous Integration/Delivery. Imagine I have 3 environments: prod, uat and dev. The code repository ...
-1
votes
1answer
90 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
vote
1answer
54 views

Publish a single ASP.NET Web application on multiple domains with Git support

I have a developer who is developing an ASP.NET Web application for me and I've been publishing it so far on my server, example1.com, so far without any problems. It is managed with a single Git ...
2
votes
2answers
167 views

How to avoid code duplication in two similar projects?

We have a website with a lot of functionality, and we now start another one, which should have a lot of common code with the first one. What would be the best approach to avoid code duplication? ...
2
votes
0answers
60 views

Bringing a large, complex legacy project under git control

I'm a newbie with respect to git, but not to version control in general — I've been using CVS and Subversion for years. I've read both the Progit and O'Reilly (Version Control with Git) books, ...
-1
votes
1answer
24 views

How to use pull requests for code reviews with a shared remote repository?

I'm looking to improve the processes in our team. We currently are pretty informal: "I've finished feature X. Can you review my code?". This is not scaling up well now that we're busier - it's hard ...
0
votes
2answers
76 views

SVN / Git How to administer branches

I'm the technical lead for a small company (6 developers). We currently use SVN and we're slowly porting over to Git, after everyone gets their training. Currently our clients are the ones who "pull ...
2
votes
1answer
93 views

Do we have distinct type of branches?

There is what we call feature branch in git. Imagine for example I am making a game and I need to add a Power-up feature. How I see my commits names with feature branches: Branch name: Adding Power-...
3
votes
3answers
144 views

Git workflow regarding remote feature branches

I've been using git for a while, but still do not understand how to deal with feature branches. When you develop in a feature branch in a strictly local manner everything makes sense. You commit, ...
2
votes
1answer
51 views

managing multiple git repo that are similar [closed]

We are creating several websites, the main content will be the same across each of them but there will be some differences (e.g. extra button, extra texts, different styling) what is the best way to ...
-4
votes
1answer
67 views

GIT - how to confirm repository ownership

I am starting a new service that would be an abstraction on top of git repositories. Basically, a user would sign up and Add Project (GitHub/GitLab/BitBucket repository). The tricky part for me is ...
-1
votes
1answer
56 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 ...
3
votes
1answer
349 views

Does it matter which branch I push to?

My question is around how branch pushes work exactly; I have come across something that doesn't make logical sense to me and as such would like an explanation as to why I am experiencing this ...
0
votes
1answer
76 views

Git branching model for teams with develop, test and deploy phases

A developed piece of code goes these phases in our team: Developers write the code Then they send it to testers If tests pass, then testers send the change/new feature/bugfix to operations team for ...
-1
votes
1answer
56 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
vote
1answer
49 views

Versioning hardware vendor SDK with git

We have n C projects which reference 4 different versions of a device SDK - 12.3, 13.1, 15.0, and 15.2. There is no public upstream repo for the SDK - it is released as a zip file. We need to patch ...
0
votes
1answer
111 views

How to handle complete rewrite of a file in regards to code review

My situation is this: I am contributing to a Symfony/PHP project. I had to completely reskin one page in the application. The controller logic is almost totally unchanged. I only had to change the ...
3
votes
1answer
85 views

Git “dynamic merge” of multiple branches

I work with a feature branch model where the branches get merged into master when they are ready. Before a larger test (specific to my field of work, involving a lot of heavy hardware), several ...
1
vote
1answer
46 views

Sould i tag a hotfix release in production using GIT scm

We have weekly planned release cycle. Following standard semantic versioning system. Like first week V3.0.0, next V3.0.1 patch release, next week V3.1.0 minor release. Apart from the above planned ...
2
votes
1answer
36 views

How to sync my fork and merge before sending pull request

I just started working with a pull and fork model. I keep sync my fork and create a new branch when I have to fix something or for a new feature. I'd like to know what to do when I have to face the ...
2
votes
2answers
144 views

Is it good practice to switch back to an old branch to develop a new feature or to create a new branch?

I have an old branch (old-branch) which I last used approximately four months ago that I used to develop a feature for a specific project. It was never merged back into master because the feature ...
1
vote
1answer
34 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
149 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
64 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-...
1
vote
1answer
86 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. ...
1
vote
1answer
94 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 ...
3
votes
1answer
215 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 ...
-1
votes
1answer
73 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
217 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
422 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
154 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
207 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
1answer
55 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 ...