Stack Overflow
Stack Overflow

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
143
votes
7 answers

difference between fork and branch on github

If I fork a project that's hosted on github. Do I fork all the branches? How do I know which branch my fork is based on? In other words which branch will be downloaded to my PC?
Jonathan.
  • 53,997
  • 54
  • 186
  • 290
140
votes
11 answers

Switch Git branch without files checkout

Is it possible in Git to switch to another branch without checking out all files? After switching branch I need to delete all files, regenerate them, commit and switch back. So checking out files is just a waste of time (and there are about 14,000…
tig
  • 25,841
  • 10
  • 64
  • 96
137
votes
5 answers

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 think that I understand how to use the Subversion command line client to perform the actions that I need most often,…
Ryan Taylor
  • 8,740
  • 15
  • 65
  • 98
135
votes
10 answers

How to update my working Git branch from another branch (develop)?

I made a new branch called feature1 from the main develop branch a month ago. ⇒ git branch develop * feature1 I've been working on feature1 for a month now and a lot of changes have been pushed to develop. How can I update my current branch…
Eki Eqbal
  • 5,779
  • 9
  • 47
  • 81
135
votes
7 answers

Applying the changes from branch A to B, without merging or adding commits

My scenario is that I have one branch in which I've made big improvements to the build process (branch A) and in another I'm working on a unrelated feature (branch B). So now when I'm hacking away at branch B, I want to pull in the stuff I wrote in…
Björn Lindqvist
  • 19,221
  • 20
  • 87
  • 122
135
votes
6 answers

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 git-merge or git-pull is NOT recommended on a branch you plan to dcommit from. Subversion does not represent merges in…
Knut Eldhuset
  • 1,789
  • 3
  • 16
  • 19
135
votes
9 answers

Git: How to find out on which branch a tag is?

I'm currently busy with a project with a lot of branches and I have a tag for last changes which where done on one of the branches. But it's not clear for me on which branch this tag is. How to find out on which branch a tag is?
Viacheslav Kondratiuk
  • 8,493
  • 9
  • 49
  • 81
133
votes
8 answers

How do I rename my Git 'master' branch to 'release'?

We would like to enforce a new policy for our projects that the master branch now be called the release branch to ensure it is more clear as to how the branch should be used. Naturally, we will have develop and release candidate branches as well. I…
Kyle Hayes
  • 5,225
  • 8
  • 38
  • 53
131
votes
6 answers

Named Branches vs Multiple Repositories

We're currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py I believe the time has come to move on to better source…
James Emerton
  • 4,129
  • 2
  • 25
  • 33
130
votes
3 answers

What do these words mean in Git: Repository, fork, branch, clone, track?

I'm honestly not clear on the semantics here. They're all about copies/variants of a code+history unit, but past that I'm not sure I could say. Is this logical structure explained somewhere?
Eric Anderson
  • 1,968
  • 2
  • 15
  • 19
127
votes
6 answers

how to reset develop branch to master

I have develop & master branches, my develop branch is messy now and i would like to reset it and make it as a copy of my master. i'm not sure if merging the master into develop will make both of them identical. after trying to merge i got many…
trrrrrrm
  • 11,362
  • 25
  • 85
  • 130
124
votes
4 answers

Mercurial move changes to a new branch

I have a number of changes that I committed to my local repository, but have not yet been pushed. Since on a feature is taking longer than expected, I want to swap these changes onto a named branch before I push. How can I do this?
Casebash
  • 114,675
  • 90
  • 247
  • 350
124
votes
3 answers

GitHub: What is a "wip" branch?

When I was browsing GitHub repositories I quite often saw "wip" branches (e.g. 3.1.0-wip). What does "wip" mean? I couldn't find the answer anywhere - neither on Google nor on GitHub:help.
akashivskyy
  • 44,342
  • 16
  • 106
  • 116
121
votes
4 answers

Merge branch with trunk

Using TortoiseSVN, I need to take changes I've done in a branch and then merge them with trunk. I am the only developer on this project, so I know trunk hasn't changed. I am learning SVN so that eventually my team can use it. Basically, I want my…
Brian Bolton
  • 3,633
  • 8
  • 35
  • 43
120
votes
3 answers

Commit changes to a different branch than the currently checked out branch with subversion

I've been working on code checked out from the development line and discovered that the changes made might be breaking changes and need to be moved to an experimental branch before committing to the main dev tree. However, I don't have the…
Paul Alexander
  • 31,970
  • 14
  • 96
  • 151
1 2 3
…
99 100