Top "Branch" questions

What is a tracking branch?

Can someone explain a "tracking branch" as it applies to git? Here's the definition from git-scm.com: A 'tracking branch' …

git version-control branch

Using the slash character in Git branch name

I'm pretty sure I saw somewhere in a popular Git project the branches had a pattern like "feature/xyz". However …

git branch

How can I combine two commits into one commit?

I have a branch 'firstproject' with 2 commits. I want to get rid of these commits and make them appear as …

git merge branch git-svn rebase

Get git branch name in Jenkins Pipeline/Jenkinsfile

I've create a jenkins pipeline and it is pulling the pipeline script from scm. I set the branch specifier to …

git jenkins branch jenkins-pipeline

Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

I've been reading up on branching/merging with Subversion 1.5 using the excellent and free Version Control with Subversion book. I …

svn tortoisesvn merge branch

Dynamically Fill Jenkins Choice Parameter With Git Branches In a Specified Repo

I have a parameterized Jenkins job which requires the input of a specific Git branch in a specific Git repo. …

git parameters branch jenkins choice

How do I manage conflicts with git submodules?

I have a git superproject that references several submodules and I am trying to lock down a workflow for the …

git branch git-submodules conflict

Svn switch from trunk to branch

I am in the root folder of an SVN-hosted project's trunk and am exploring setting up two branches. One branch …

svn branch trunk

How to correctly close a feature branch in Mercurial?

I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close …

merge mercurial branch hg-merge

Git undo local branch delete

I just deleted the wrong branch with some experimental changes I need with git branch -D branchName. How do I …

git branch git-branch