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

Why do I see more remote branches locally then I've got on github?

I've got a git repo hosted on github. When I do git branch locally I get just the three branches you see in the output below: $ git fetch $ git branch * develop kramer65/feature-branch master I then logged into github and on there I see it just…
kramer65
  • 50,427
  • 120
  • 308
  • 488
3
votes
2 answers

Setting up a lab to experiment with GIT

I'm a newbie (like 6 months) Linux user. I'm using Git for quite a while, and now I'd like to start learning more advanced stuff. What I'd like to learn is a variety of ways to handle/manage remotes. So my question is — how can I setup a "remote"…
oldhomemovie
  • 14,621
  • 13
  • 64
  • 99
3
votes
1 answer

Mercurial - block access to a branch using ACL extension on Windows

I am trying to deny everyone commit access to a branch using ACL on Windows but can't quite seem to figure it out. According to the little documentation I've found this should work. My hgrc file: [extensions] hgext.acl= [hooks] pretxncommit.acl =…
jfrobishow
  • 2,897
  • 2
  • 27
  • 42
3
votes
2 answers

Mercurial: Merging between branches... Backwards?

The Situation: I am new to Mercurial. I recently setup and have started using a repository in a model recommended to me (see Rudi's diagram below). Things have been going fine but I have run into my first practical application problem. Mercurial…
Nathan Hartley
  • 4,005
  • 2
  • 43
  • 46
3
votes
2 answers

git merge command use

I can't make correct branch merge in git. For example, I have two branches: C - D - E my_branch / A - B - F - G - K *master Now I am on master. After "git merge my_branch" I got at master some like this: A - B - C - D - F - G…
Pavel
  • 2,602
  • 1
  • 27
  • 34
3
votes
1 answer

Make unable to branch merge [Lock for merge?]

I was wondering, if it's possible to make branches unable to merge? For Example: I have master, branchA, branchB. I'm currently working on branch branchB which is completetely different from the other branches. How to make this branch unable to…
Malakai
  • 3,011
  • 9
  • 35
  • 49
3
votes
1 answer

How to hold back a named branch while pushing the default branch?

Say I commit some changes to a new local named branch called 'X'. Then I commit some other changes to my 'default' branch. Can I push only the changesets on 'default', but not the changes on 'X'? Might my approach be wrong? If so, please offer…
Jonathan
  • 32,202
  • 38
  • 137
  • 208
3
votes
2 answers

TFS grant permissions to only one Branch

I was asked to grant permissions to several TFS users. These users must have access to one branch only. How can I do this? I'm going to create new TFS user group and deny access to root of Source Control, then allow access to necessary branch. What…
Vadym Fedorov
  • 2,395
  • 2
  • 21
  • 31
3
votes
1 answer

Why does git checking out origin/master leads to detached-HEAD

As the title says, why does this happen? As explained in documentation and tutorials origin/master is actually a local copy of branch on remote. So why does checking out to it leads to detached HEAD if it is "Just a local copy of the branch"
Igor Čordaš
  • 5,785
  • 4
  • 42
  • 54
3
votes
1 answer

Rename local GIT branch breaks Git Flow in SourceTree

While using SourceTree I renamed the two main local branches (master and develop). However, when I now click on the Git Flow icon to start a new feature, it tells me that the repository needs to be initialized (even though it has been already been…
Sean M.
  • 33
  • 2
3
votes
2 answers

How to share a large git merge amongst team members

When merging two branches together that results in 1000+ conflicts (the branches have diverged a lot), what is the best practice for being able to divide that work up among a team of people? Say the code base is in a Visual Studio solution…
gmcc051
  • 390
  • 3
  • 17
3
votes
3 answers

Can I branch in Mercurial without cloning the repository?

Recently, I've started experimenting with Mercurial, due to the fact that it always attracted it because of its simplicity and "just works" principle. Or at least, that's how others always described it. They also usually described it as "practically…
Rook
  • 60,248
  • 49
  • 165
  • 242
3
votes
1 answer

Merge Changes for specific Work Item

In TFS 2010 we have a development branch where all development is done for one product. I want to merge some of these changes to a release candidate branch, so it can be tested and rolled out. Therefore I would like to merge all changesets that are…
JensMig
  • 31
  • 2
3
votes
2 answers

git - revert branch to look like master?

I have two branches develop and master. There are lots of commits in develop that are not in master yet. Though I need to make develop branch look exactly the same as master. To preserve all changes that happened into develop, I will create new…
Andrius
  • 19,658
  • 37
  • 143
  • 243
3
votes
1 answer

Create TFS 2010 branch from checked out items?

I've edited some files in Branch1 and found out I would like to check the pending changes in to a new branch, Branch2. Is this possible? I know I can create the branch as normally and then copy all the changed files to Branch2 by hand but that can…
Martin Ørding-Thomsen
  • 7,207
  • 3
  • 21
  • 22
1 2 3
…
99 100