DevOps Stack Exchange
DevOps Stack Exchange

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.

Git is an open source distributed version control system.

From Homepage:

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Git is easy to learn and has a tiny footprint with lightning fast performance. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.

Resources

Related tags:

189 questions
34
votes
5 answers

Where to put ansible-vault password

We are planning to use ansible vault in our project to prevent leaking passwords or keys in git. The idea is to put all our sensitive data into a plain file then encrypt this file with ansible-vault using a password before pushing to git. To…
storm
  • 1,759
  • 3
  • 16
  • 34
29
votes
5 answers

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 conflict its complaining about. To be clear, I have done a…
Daniel
  • 569
  • 2
  • 5
  • 13
24
votes
4 answers

How to get rid of develop branch for simplified Git flow

In a continuously developed web project (not a product) we currently have the following branching strategy, roughly based on git flow: develop branch: latest working version master branch: version to be released / released version feature branches:…
Fabian Schmengler
  • 485
  • 1
  • 4
  • 11
23
votes
1 answer

Git clean/smudge filters for ansible vault secrets

I am trying to setup clean/smudge filter in git to have automatic encrypting and decrypting of files containing secrets thru ansible-vault command. Peculiarity of the ansible-vault command is that it is not idempotent (it creates a different binary…
ᴳᵁᴵᴰᴼ
  • 1,173
  • 10
  • 22
18
votes
3 answers

Which SCM tools does Jenkins support?

I'm aware that Jenkins supports Git and SVN. What other SCM tools does Jenkins support?
kenorb
  • 8,011
  • 14
  • 43
  • 80
14
votes
2 answers

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 random repositories built on differing…
user210757
  • 243
  • 1
  • 2
  • 5
14
votes
3 answers

Getting a single revision from Git

Having the full Git revision history has a lot of benefits as part of the development process. But our product is the source code, we are using scripted languages that don't need compilation or processing, and then the Git history becomes a burden…
Rsf
  • 340
  • 1
  • 9
13
votes
3 answers

How are you enforcing git behavior, including locally (particularly on Windows)?

I'm taking point on moving this .NET shop from svn to git, and have identified some ancillary issues I'd like to have a solution for before we flip the switch. The one I'm asking about in particular in this question is line-ending enforcement. By…
ndarwincorn
  • 133
  • 4
13
votes
2 answers

how to automatically create a subdomain for every pull request

Background I got a team of untechnical QA's who have to do testing on iOS/android apps for every Pull Request (PR) that gets created by my backend team. Question This is what I want to do: everytime a backend engineer creates a PR on bitbucket, I…
abbood
  • 473
  • 4
  • 13
11
votes
2 answers

Git & Jenkins: get latest green commit on branch

We're just starting to push for CI-CD and as a baby step we're going to try updating a stack with the latest green develop once every couple of hours. I am fairly new to Git/Bitbucket, and can't figure out how to ensure the checkout that Jenkins…
Alex
  • 4,612
  • 6
  • 29
  • 49
11
votes
2 answers

Is it possible to autodeploy on every commit in a specific branch using Travis CI and GitHub?

I'd like to deploy files using Travis CI and it only works for a tagged commit. When committing to the branch, there is a warning: Skipping a deployment with the releases provider because this is not a tagged commit. Is there any way to deploy on…
kenorb
  • 8,011
  • 14
  • 43
  • 80
11
votes
4 answers

How to structure DevOps related code and configs in a code repository?

We've been growing as a company, our products are expanding and our DevOps related activities and efforts are growing as well - we've switched from Bamboo to a more flexible and configurable Jenkins, using deployment pipelines and other plugins;…
alecxe
  • 849
  • 1
  • 16
  • 36
10
votes
1 answer

How do I trigger scripts on a merge or when a branch is deleted?

I am using jenkins multibranch pipelines. If a branch is merged and deleted jenkins removes the branch from the pipeline as well. This is great, but I want to run a command/script when a branch is removed, how can I have jenkins run a command when…
red888
  • 243
  • 3
  • 10
10
votes
2 answers

Git seems to recognize http.sslcainfo property from .gitconfig but ignores it on execution? SEC_E_UNTRUSTED_ROOT

all, I have a working certificates chain (testable with OpenSSL) but somehow I cannot manage to tell Git to load these certificates. I get the same "untrusted root authority" error (SEC_E_UNTRUSTED_ROOT) independently of whether my git…
Ta Mu
  • 6,792
  • 5
  • 43
  • 83
9
votes
1 answer

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 check out the branch locally). In the 'branches'…
Slowacki
  • 193
  • 1
  • 5
1
2 3
…
12 13