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
2 answers

Running two projects (trunk & branch) at the same time in Eclipse

I was wondering if it's possible to run two projects at the same time in Eclipse, for example by using two different instances of JVM (if that makes any sense). A bit of the background: I have a project that executes relatively long experiments…
posdef
  • 6,498
  • 11
  • 46
  • 94
3
votes
1 answer

How do I create a new branch based on an existing Git hub branch? (Please read - tried the beginners guide)

I have a master branch and would like to create a new branch based on it, and then switch to the new branch. I'm very very new to coda/github/terminal so I don't even know if my syntax is correct. here's what I typed in, letter for letter, with the…
pc-mac
  • 31
  • 1
  • 2
3
votes
2 answers

Git Parameter Plugin - filtering branches

I'm trying to use the GIT Parameter Plug-in to list all release branches that need to go in a build process. If I use the plug-in only specifying the parameter type it works fine simple plug-in configuration When I try to filter the list using the…
lorenzo rantucci
  • 31
  • 1
  • 1
  • 3
3
votes
2 answers

Correct procedure to use pending branch changes in a new branch

You submit a pull request to merge Branch A into master. While this is pending (1 hour or so) and you want to use the pending features of branch A while you are waiting, you make Branch B Should Branch B be a branch off of Branch A or should…
LearningJrDev
  • 911
  • 2
  • 8
  • 27
3
votes
3 answers

What's a good way of branching specifications alongside code using TFS and Sharepoint?

We are a software product company and our product codebase naturally gets branched for different projects. We currently use TFS2008 configured to store documents in SharePoint 2007. Both of these will be updated to 2010 versions, starting with…
Francis Norton
  • 674
  • 1
  • 8
  • 16
3
votes
1 answer

Split branch into one branch per commit

In this project I'm working on, I'm supposed to commit my progress to a repo using pull requests, and every commit has to be in a different branch. The problem is that the last 3 commits were pushed in a single pull requests and I'm supposed to move…
3
votes
3 answers

How can one retroactively branch in subversion, or how can an one record a revert of a merged patch

Part of the development I have done on a project can not be deployed, and should have been done in a separate branch. I have merged in the backwards changes (via tortoise's "revert changes from this revision" and careful editing), undoing the work…
Cirdec
  • 24,019
  • 2
  • 50
  • 100
3
votes
1 answer

Git vs SVN: can I have single change in history for several branches?

We have to keep 2 product versions. Now, some changes in each version have to be backported to another version. In SVN, if I made "change" to version 1, I merge this revision to version 2 and give comment like: "Merged 'change' from v1". This is…
queen3
  • 15,333
  • 8
  • 64
  • 119
3
votes
1 answer

Lock the Git branch

Is there a way to lock the Git branch for writing AND reading? So that no writing to the branch and no cloning from the branch will be possible, but just for one person who is build engineer? Here is the scenario: The code has been pushed to the Git…
Igor
  • 5,620
  • 11
  • 51
  • 103
3
votes
1 answer

How do I branch using SVN on CodePlex?

Unless I am missing something very obvious, I don't see how I can branch on CodePlex using SVN. I'm looking at the popular projects and can't see anything about a trunk or branches. What am I missing? Also, I'm using TortoiseSVN.
Mike
  • 4,257
  • 3
  • 33
  • 47
3
votes
0 answers

Jenkins with SVN branches in non-standard locations?

I know that it's possible to track all SVN branches with Jenkins using the "List Subversion Tags" build parameterisation options. But as far as I can see, this method relies on a standard branches/ structure. Our organisation uses a…
naught101
  • 18,687
  • 19
  • 90
  • 138
3
votes
1 answer

Local branch behind remote branch (pull, rebase, fetch, merge)

If I am working on my branch, branch1 and then I push some commits while my team member was also working on branch1--when it comes time for my team member to push his changes, he's now behind. What is the easiest way for him to get my most recent…
Nxt3
  • 1,970
  • 4
  • 30
  • 52
3
votes
1 answer

Git: Fixing errors in main branch while working at another branch

I work at a Git project. My further work plan is to switch from main branch to to "devel" branch where I develop new features. But it is possible that sometimes while working in "devel" branch I may spot an error. If I spot an error, I should…
porton
  • 5,214
  • 11
  • 47
  • 95
3
votes
2 answers

How do I find out which files I've changed in Perforce branch?

I've got a (sparse) development branch in Perforce which I keep up to date regularly with the main code line. I'd like a simple way to list all the non-integration changes which have been made to the branch, ideally checked out into a new changelist…
cristobalito
  • 4,192
  • 1
  • 29
  • 41
3
votes
2 answers

Git branch naming to show parent branch

Suppose I have two main branches: master and dev. All of my development efforts are branched off of dev then merged back into dev, then eventually into releases then merged into master. I would like to name dev sub-branches with a dev/ prefix to…
Bob Dylan
  • 1,773
  • 2
  • 16
  • 27