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
23 votes
4 answers
6k views

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 ...
Fabian Schmengler's user avatar
5 votes
2 answers
2k views

Coupling docker registry and source control

What are the best practices (if any) for coupling a docker image registry with a SCM service (such as bitbucket)? I know a docker registry can live in artifactory, but how can I assure that the two ...
scott's user avatar
  • 466
27 votes
5 answers
179k 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 ...
Daniel's user avatar
  • 549
18 votes
3 answers
6k views

Which SCM tools does Jenkins support?

I'm aware that Jenkins supports Git and SVN. What other SCM tools does Jenkins support?
kenorb's user avatar
  • 7,911
8 votes
1 answer
2k views

How to ensure that git subtrees are kept up to date?

Problem: We use Data Transfer Objects (DTO) to ensure consistent interfaces across multiple services using TypeScript. We're currently using a git subtree in order to make sure that each ...
Jack Murphy's user avatar
7 votes
2 answers
409 views

What branching strategies/workflows are available for Git repositories?

I'm looking for a high-level, summary description of the recommended branching strategies/workflows primarily applicable with Git, which would serve as a guide for navigating this environment. ...
Dan Cornilescu's user avatar
4 votes
1 answer
477 views

What's the practice to perform a releasing with Git?

I'm using GitLab CE with Maven project, and try to follow the Environment branches with GitLab flow and The 11 Rules of GitLab Flow The step for releasing is as the following: - feature +--- +-...
Charlee Chitsuk's user avatar
3 votes
1 answer
346 views

Necessity of mirroring git repos for small team considering switching to Azure

Question: Are there any benefits to mirroring our git repos outside of Azure devops for a small (~7) team of developers who all work in the same office? Background Information I'm a developer ...
Scrambo's user avatar
  • 131