Questions tagged [branch]

A "branch" is a term used in version control systems to represent an independent line of development. Depending on the system, a repository can contain one or more branches. Branches are merged when changes need to propagate from one branch into another.

A "branch" is a term used in version control systems to represent an independent line of development. Depending on the system, a repository can contain one or more branches. Branches are merged when changes need to propagate from one branch into another.

Source: Wikipedia Branch (Version Control)

Related tags:

5403 questions
3
votes
1 answer

Order branches in `git branch --all` by branch name

I have a repository with multiple remotes. When I issue a git branch --all --verbose it shows: bar 9876de11 hello world foo 12abde23 description master 34fd4545 tony the pony quz …
Boldewyn
  • 81,211
  • 44
  • 156
  • 212
3
votes
1 answer

How can I "split the branch further" in mercurial?

Admittedly a misleading title, but I didn't know how to put it better. So I made the mistake of pushing all my project specific changes BEFORE I opened a branch. That way, there are some changeset sitting in the default branch that does not belong…
Enno Shioji
  • 26,542
  • 13
  • 70
  • 109
3
votes
4 answers

Checkout a complete Subversion tree excluding tags/ and branches/

I'm working on a corporate source code tree that contains 100s of Maven sub-projects. Since each sub-project has its own layout of branches/ and tags/ sub-folders, the entire tree is laid out something like this: root/ some/intermediate/dirs/ …
0xbe5077ed
  • 4,565
  • 6
  • 35
  • 77
3
votes
1 answer

Can't switch branch: untracked working tree file because of case-insensitivity?

I want to merge the develop branch into the master branch and I thougt I do something like this: git checkout master git merge --no-ff develop git tag -a 1.0.0 but on checkout I get git checkout master error: The following untracked working tree…
testing
  • 19,681
  • 50
  • 236
  • 417
3
votes
1 answer

Getting the revision number of the end of a branch in WinCvs

I need a CVS command that given the name of a branch, it will give you the revision number of the last file in that branch. CVS Tree structure: (filename) | +--> 1.1-----(branch) | | | 1.1.1.1 | …
tjwrona1992
  • 8,614
  • 8
  • 35
  • 98
3
votes
1 answer

Sourcetree Failed to push some refs to repository

I use Sourcetree as my version control system with a master and a develop branch, feature, hotfix and release branches. Accidentally I was on branch master, committed to it and pushed to origin where I should have committed to my feature branch…
Karl
  • 410
  • 11
  • 25
3
votes
1 answer

Mercurial: Class library that will exist for both .NET 3.5 and 4.0?

I have a rather big class library written in .NET 3.5 that I'd like to upgrade to make available for .NET 4.0 as well. In that process, I will rip out a lot of old junk, and rewrite some code to better take advantage of the new classes and support…
Lasse V. Karlsen
  • 380,855
  • 102
  • 628
  • 825
3
votes
1 answer

What is the state of the art of continuous integration vs feature branch as of early 2015?

I'm kind of new into the world of continuous integration. Because i want to practice CI/CD properly i try to read about the best practices but it is quite of a puzzle to me. I wonder if someone with experience could let me know as of today what is…
3
votes
1 answer

SVN mergeinfo property and branches

Here we go again with svn:mergeinfo. I have read all the Q/A regarding it but I have come across a case that does not seem to be covered in the existing posts here. My trunk is clean of svn:mergeinfo, i.e. this: svn propget svn:mergeinfo…
introiboad
  • 997
  • 1
  • 11
  • 18
3
votes
2 answers

Git-svn branch hoses dcommit when using an odd branch structure

I had a boss, past-tense, who decided to put svn branches in the same folder as trunk. Normally, this wouldn't affect me that much but since I'm using git-svn things are going so well. After I did a fetch it created a folder for each branch in my…
Chuck Vose
  • 4,560
  • 24
  • 31
3
votes
1 answer

Branch coverage with missing else

Given some code: int(x) { if(x==0) { dosomething } } If I run this with two test cases: t1 = <0> and t2 = <2>, will this provide me with 100% branch coverage even though the else statement is missing? In other words, does the else statement need…
user1686342
  • 1,265
  • 1
  • 18
  • 24
3
votes
1 answer

git (any SCM) and compiling object files, switching branches, physiology thereof

If I compile branch A, then switch to branch B, compile, and switch back to branch A. All the object files touched by the compile of branch B have to be recompiled! Normally one does not check-in object files, but there seems little choice…
Ian Vaughan
  • 20,211
  • 13
  • 59
  • 79
3
votes
1 answer

Should I use Git branches to store unrelated code?

I have a question about a non-standard git branching strategy. Let's say I have a lot of small files, like scripts for instance, all largely unrelated with each other. Let's say I divide these up, into various conceptual groupings, and then commit…
Jeffrey
  • 53
  • 4
3
votes
3 answers

git branch | grep '^SomeThingInFrontOfLine' not working

I have a lot of git branches, I want to search only those begin with certain letters i.e $git branch branchA.abc.1234567 branchA.cbc.1234457 branchB.cbc.1234457.branchA.backup branchC.cbc.1234457.branchA.backup And i want to only search those…
user97662
  • 942
  • 1
  • 10
  • 29
3
votes
0 answers

git branch -r not showing all remote branches

I don't see all my remote branches with command git branch -r origin/HEAD -> origin/master origin/master But then I use git ls-remote origin the output is e7ae5a2136ac27528cb201040f432faf29034d67 HEAD a085ebd1c7f0477cee4bbad92810e057f5899b6b…
1 2 3
99
100