Top "Branch" questions

Git: Merge in only one commit

Usually, I work with branches in Git, but I don't like to see hundreds of branches in my working tree (…

git branch

Is git-svn dcommit after merging in git dangerous?

My motivation for trying out git-svn is the effortless merging and branching. Then I noticed that man git-svn(1) says: Running …

svn git merge branch git-svn

Make git master HEAD point to current HEAD of branch

I have to admit that I haven't played with gits advanced features but on my current project I had to. …

git branch revert head

When should you branch?

When working with a SCM system, when should you branch?

version-control branch

SVN: is it possible to get svn info for a given revision number of a branch

Is it possible to get svn info for a branch for a specific revision number. For example if the latest …

svn branch revision

Need to restore a deleted branch in Subversion

I have two working copies of a Subversion repository, one of the trunk, and one of a branch I created. …

svn version-control branch

Git - how to force merge conflict and manual merge on selected file

We maintain web application which has common master branch and many parallel branches, one for each installation, each have few …

git merge branch conflict manual

How do I identify what branches exist in CVS?

I have a legacy CVS repository which shall be migrated to Perforce. For each module, I need to identify what …

command-line scripting cvs branch

How do I "move" my commits from "no branch" to an actual branch?

I made a mistake, and started making commits "to the last tag", which lands my commits in "no branch". They …

git merge branch commit git-branch

Following git-flow how should you handle a hotfix of an earlier release?

If you try to follow the git-flow branching model, documented here and with tools here, how should you handle this …

git branch git-flow hotfix