Skip to main content

Questions tagged [git]

Use this tag for questions about Git, a free and open source distributed version control system, related to using Git for topics such as continuous delivery, monitoring, building SDLC infrastructure, etc.

Filter by
Sorted by
Tagged with
0 votes
0 answers
13 views

How to create a pull request using the Azure DevOps plugin in JetBrains Rider?

I have installed the Azure DevOps plugin for Rider on macOS, and I am trying to create a pull request from my local branch into the remote master branch up on DevOps. I was able to authenticate and ...
0 votes
0 answers
12 views

How to review Azure Devops git repo pull request in an IDE like Visual Studio?

I wonder if there is a way to review pull requests in an IDE like environment (which is easier to visualise merge conflicts). The main pain point is having to check merge conflicts resulting from the ...
0 votes
0 answers
9 views

How to auto-link issue IDs to an external issue tracker in Azure Repos?

I use Azure Repos and an external issue tracker. My commits start with AB-123. I want those IDs to be linked to my external issue tracker like to http://myissue-tracker/AB-123. How to do this in Azure ...
0 votes
1 answer
2k views

Why don't I see conflicts in git, but ADO shows conflicts, and how to fix this?

I have already read How to resolve merge conflicts in Azure DevOps current UI but nothing there helped. Also, no, I cannot use "Pull Request Merge Conflict Extension", I am not the admin of ...
0 votes
1 answer
306 views

Gitlab build from multiple repositories - git submodules

I have gitlab repo ZERO (project) which serves as a code base for multiple websites (repo ONE, TWO, THREE..), these are also gitlab repositories. I am using gitlab CI/CD options, I want to be able to ...
1 vote
1 answer
1k views

Best practice for building releases with Jenkins multibranch pipeline

We have started moving from Subversion to git (using Bitbucket, to be exact), and I'm unsure how to manage release builds with the multibranch concept. This is how we do it in Subversion: We have one ...
0 votes
3 answers
225 views

Estimate storage space for a git server

How to estimate the space a git repository will take on a source version control server? For example, given k commits every day, with x kB of code per commit, my repository will take n GB of server ...
1 vote
1 answer
9k views

Jenkins checkout GitSCM and git step how does it work internally and why

When I execute my pipeline and I go and see on the actual Jenkins slave, the checked out commit doesn't have latest changes. But the logs and actual files in the workspace on the Jenkins slave running ...
0 votes
1 answer
513 views

bitbucket pipeline to push commits to another repo

So this is the scenario i have right now, we have a repo (boilerplate) that contains our infrastructure code, docker files, and pipeline scripts, each time we create a new project we copy this repo to ...
0 votes
2 answers
619 views

Jenkins: Re-use repository with reference option and do changes on it

I would like to setup a Jenkins cluster where the slaves are building an Android ROM with some parameters like branch (e.g. lineage-16.0) and some optional patches. The whole repository will consume ...
0 votes
1 answer
229 views

Why is Azure Repos Git Checkout sometimes returning a Status code 128?

We've migrated from a on premise GitBlit to Azure DevOps last week. Our builds are now suffering from periodic error while cloning the git repo. See example output. Main error is probaby returned ...
0 votes
0 answers
29 views

Does GitHub CI support push options?

GitLab has a whole page of documentation on the git push options that it supports, https://docs.gitlab.com/ee/user/project/push_options.html Does GitHub support any push options? I would like to ...
0 votes
2 answers
435 views

What is a "chore commit"?

I've seen the term "chore commit" used in multiple places, what is a chore commit? And it's in the commit message here. chore(gitattributes): ensured consistent line endings across OSs ...
0 votes
1 answer
60 views

How to update GitHub issue commit links after migrating code and issues from another repository?

We are an organization with multiple repositories in GitHub which we are merging into a monorepo. We have no issues with the mechanics of how to do this: Use something similar to the method outlined ...
0 votes
1 answer
271 views

Azure DevOps Build Validation of other repo's pipeline: "while loading the YAML build pipeline. Object reference not set to an instance of an object."

This (nearly empty) Azure DevOps pipeline yaml fails when initiated because of a PR from another repo's Build Validation: azure-pipelines.yaml of "App A": pool: name: default steps: - ...
1 vote
1 answer
68 views

Azure DevOps issue with GIT, Visual Studio and Azure (Umbraco)

I am completely new to Visual Studio, .net and Azure DevOps I have a problem with GIT using the GIT bits (rather than CMD), in Visual Studio I have a .Net application (Umbraco), that has been built ...
1 vote
1 answer
971 views

How do I configure my AWS SSO-managed user with my public SSH key?

My AWS identity is SSO-managed, not an IAM user. I wish to upload my public SSH key (so as enable client UI access to CodeCommit) but am not the AWS account/organisation admin so cannot see what the ...
13 votes
2 answers
14k views

Multi-language Monorepo

We currently have a "front-end" git repository that is all of our JavaScript client apps, and a "back-end" git repository containing all back end APIs written in .NET Core. There is also a few other ...
0 votes
2 answers
326 views

How to organize Gitflow releases with multiple environments for web application?

We use gitflow branching strategy for different reasons, one of them being complicated bureaucracy around releases. We have environments: dev, qa, preprod, prod. Once the developers finish their work ...
2 votes
3 answers
110 views

Is the forking git workflow used outside of open source projects?

Here is the Forking workflow if you're not familiar with it. The company I work for is mostly comprised of historically open source developers. This has caused them to be stuck on the forking workflow ...
5 votes
2 answers
3k views

Jenkins trigger build if shared library changes

I have Jenkins Pipeline job define in my git repo as. // File: deployment/jenkinsfiles/staging/Merge @Library("my_shared_lib") _ import com.company.myteam.Constants pipeline { agent { label "...
0 votes
1 answer
42 views

What is the difference between The Shared repository model and fork and pull model?

I am trying to understand what is the difference between the two. The Shared repository model: uses ‘topic’ branches, which are reviewed, approved, and merged into the main branch. Fork and pull model:...
2 votes
1 answer
4k views

Is there a way to avoid deleting a branch in Azure DevOps without obliging pull requests?

In Azure DevOps, configuring a branch policy ensures the branch cannot be deleted. However this also obliges to use pul requests to make changes to that branch. Currently we are not using pull ...
0 votes
1 answer
472 views

Is there a way to increase Rate limits on Azure DevOps?

We were using an on premise Jenkins against an on premise GitBlit. This worked fine. Last week we migrated from GitBlit to Azure DevOps. Our Jenkins Jobs now run with the PAT of a 'fake' Azure Account ...
2 votes
0 answers
61 views

Jenkins build fails when no commits in the code (ChannelSftp.throwStatusError)

I have built a jenkins pipeline for executing a test on a windows server. Once the automated test report is generated on the windows server, it ships that report to a different server. There are ...
0 votes
0 answers
214 views

is it possible to get web application url from branch without publishing it?

When working on the task we create git branch (AzureDevOps). In this branch we modify code in VS and can run web application on localhost. When it's done we commit changes and create PR. To test it ...
1 vote
1 answer
278 views

Can you delete project binaries from an Azure Devops repo

I have an existing repository in Azure DevOps that is currently tracking various /obj, /bin files (.dll, .pdb, .cache, etc.). I don't want to track these anymore; however I am worried that if I delete ...
2 votes
1 answer
270 views

How to test pipeline changes in Azure?

I currently have a pipeline in Azure which consists of a bunch of YAML which eventually calls some terraform script to handle the deployment side. What is the best way to handle dev testing of changes ...
3 votes
4 answers
8k views

Is there a way to use a Jenkinsfile from a git-submodule in a multibranch pipeline?

Background: The nature of our project's source involves multiple long-living branches, each one has its own Jenkins job (manually created). Multibranch limitation: Unfortunately we do not use a ...
3 votes
1 answer
59 views

Gathering timespan statistics from Git

I would like to easily query git to answer a question like the following: How much time passed from when a developer made a git commit to when that commit was merged to a default branch from a feature ...
2 votes
0 answers
364 views

Complete automatic release process (with versioning) on a multibranch pipeline?

We have projects that once in a while need to be released with all the changes already present in the develop branch. Every time we make a new release, we update the code with the new release version ...
0 votes
1 answer
189 views

What is manual, what is automatic in Continuous Delivery?

I've read lots of articles about the concept on the internet. I thought I got it, but some statements in other articles make me confused. In order to simplify and clarify things, I'll presume I use ...
2 votes
2 answers
92 views

How to incorporate feedback from pull request

I am new to bitbucket. I tried to google it but unable to find exact answer for my question. I created a feature branch. Made few changes in the feature branch then I pushed/committed all the changes ...
4 votes
1 answer
3k views

How to ansible-vault files as they are commited to Git

I'm trying to use ansible-vault to secure the secret files in my project before I push them to Git. There's loads of advice out there on how to set this up in part, but everything I've read is ...
0 votes
1 answer
70 views

How can I create a dev. environnement using Azure DevOps?

I'm not sure if it's the right place to ask this question. So let me know, if it's not. I'm building a front end app with VueJs. I actually use 2 computer. I use the first computer as a "server&...
1 vote
1 answer
803 views

How can you do pre-merge testing in trunk based development?

Currently, we use a simple branching strategy, with a single main branch and one layer of feature branches; no branches on branches on branches. We also have many pipelines that run against each PR to ...
0 votes
1 answer
3k views

Create a folder in slave node using Jenkins pipeline groovy script

I have a Jenkins job which runs on a slave node on another machine, both master and slave run on windows. The slave node is being run as a windows service. The main repository has git submodule ...
2 votes
0 answers
127 views

Jenkins declarative pipeline with mvn, releases and versioned artifactory

We have a requirement to support human defined versions (not auto generated) for patch releases. I'm trying to figure out a way to do this in Jenkins. We have: BitBucket, Jenkins, Nexus/JFrog (either)...
8 votes
1 answer
4k views

Is it possible to view all changes made on a Git feature branch in Azure Devops?

Azure DevOps offers the overview of changes made in a branch when a PR is created. However, sometimes I'd like to have access to that overview when viewing a branch without the need to create a PR (or ...
1 vote
1 answer
3k views

How to get all open Merge Requests using git command line?

I need to get all open Merge requests by author and if possible within a time frame. Tried using this command for Github where it works fine - git ls-remote origin 'pull/*/head' But in gitlab, this ...
0 votes
1 answer
1k views

how to pull only git logs without pulling the whole file tree and diffs

I have a server that has limited storage space and I need to track a git repository, but I am only interested in the log messages and not the whole repository (blobs, diffs, tags, ...). the repository ...
27 votes
5 answers
178k views

How to resolve merge conflicts in Azure DevOps current UI

I have followed the instructions on command line: https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio all I want to do is resolve this merge ...
2 votes
2 answers
4k views

Git keeps asking for ssh passphrase when SSH is already defined in GitLab

I'm playing around with a personal GitLab account to get familiar with its' ins and outs. First, I followed this primer on setting ssh keys and added public and private ED25519 keys to ~\.ssh. I added ...
2 votes
0 answers
53 views

How to push large codebase to lots of servers

I am currently creating a concept for a multi-stage release pipeline using Azure DevOps release pipelines. The software stack that should be deployed is a rather bulky PHP application that uses lots ...
1 vote
2 answers
196 views

How to track deployments of multiple interconnected repositories

We are working with a ERP system (called Odoo, but that does not matter so much). It consists of many building blocks. Some of this modules/addons are dependent on others, some are standalone, but ...
2 votes
1 answer
383 views

Commit messages from Submodules to Jenkins Change Log

I have a project with 3 submodules that are updated whenever that project is built and the project is built mainly for an installer (which is not in a submodule). Not a lot of changes are made in the ...
1 vote
1 answer
5k views

Using a conditional environment{ } directive in Jenkinsfiles

My Jenkinsfiles use the environment{} directive. I've been trying to set a condition where I invoke different variables depending on the GIT branch being builded. I've tried something like e. g. : ...
2 votes
1 answer
2k views

Bitbucket: Is there any option to restrict deletion of release branch only after it is merged to master

We are using GitFlow workflow. After merging the release/* branch to master, we need to close the branch. For this task, we need to provide deletion access to pull request merger but in this case, ...
5 votes
2 answers
1k views

What is the way to update images in a configuration git repository when doing gitops?

i'm trying to do gitops I have a Configuration repo containing k8 manifests and different app repos. 1) App repo's CI build docker images and pushes into registry. 2) App repo's CI commits into ...
2 votes
2 answers
1k views

One or multiple git repositories for independent small parts of one larger project?

We are developing an Azure-based analytics platform that consists of several modules. Among other things, Azure functions, scripts for creating the infrastructure and scripts for initialising the ...