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:

5019 questions
3
votes
2 answers

Eclipse project with Subclipse: Introduce trunk and branches

I have a project in my workspace (without trunk and branches) and need to create a copy of the current release for providing bug fixes for this release while working on a new feature, as described here:…
ideaboxer
  • 3,083
  • 6
  • 36
  • 57
3
votes
1 answer

How can I push a new branch?

I created a new branch. After some modification I would like to push the branch to the server git commit -m 'New branch' 13 files changed, 694 insertions(+), 36 deletions(-) git push origin malix1.0 Everything up-to-date Why it is everything up…
Kicsi Mano
  • 2,781
  • 3
  • 19
  • 25
3
votes
1 answer

Isolate specific folders from updating on git

I'm not that experienced with version control and it's my first time with Git. We're using BitBucket and TortoiseGit, set it up and working. Now, I would like to be able to isolate a folder (let's call it "resources") which will hold some resource…
ichtyander
  • 31
  • 1
3
votes
1 answer

Only trigger builds on new branches in Jenkins?

I have a git repository that is a few years old with 100s of branch. I only really want to get Jenkins to start running builds on newly pushed branches and not the previous ones. Currently I'm trying to trigger it via a URL within the post-receive…
gak
  • 29,596
  • 24
  • 111
  • 150
3
votes
3 answers

Conflicts when merging into branch some changes in deleted code

We've recently created a branch with a version of code customized for a certain client. We're working on both branches at the same time, commiting 'common' changes into the trunk, then merging them to the branch. Recently, we've come to a…
akavel
  • 4,351
  • 1
  • 31
  • 61
3
votes
1 answer

git: How to get the latest commit on a specific file, regardless of branch?

I have this big repository containing different modules, which should have been broken down in different repositories, one for each module. Sometimes I created a branch, say featbranch, in the repo to work on a specific module, but featbranch had no…
Eduardo Bezerra
  • 1,762
  • 1
  • 16
  • 30
3
votes
1 answer

How to recover a merge commit after a rebase on the same commit?

Suppose this: mkdir test; cd test echo "1" > file1; git init; git add .; git commit -m "initial - file 1" # 1st commit on master echo "2" > file2; git add .; git commit -m "file 2" # 2nd commit on master git checkout -b…
bitlogic
  • 33
  • 3
3
votes
2 answers

How do I "merge forward" in svn?

For instance, suppose I have a branch that I want to update with the new stuff in trunk. I've always just merged trunk into the new branch, but I came across a somewhat different process that Divmod uses. Does divmod have some kind of special…
Jason Baker
  • 171,942
  • 122
  • 354
  • 501
3
votes
1 answer

Git merging hotfix branch into feature branch, then removing hotfix branch?

I'm very new to Git, but am very impressed by the lightweight branching/merging it provides. I have three branches in my repository: master 1.1.0 1.0.x I have made a quick fix in the 1.0.x branch, but I'm wondering if I should immediately merge…
Craig Otis
  • 27,979
  • 23
  • 117
  • 216
3
votes
1 answer

git branching workflow

I'm having trouble figuring out what to do manage the branches in my project. I have been working on a feature branch, "loads", which was branched off of "dev". Since branching, "dev" has moved forward by a few commits. Now, another developer…
parker.sikand
  • 1,323
  • 1
  • 14
  • 32
3
votes
1 answer

Does the folder I am in have any significance in git?

I am git newbie. Learning while doing things. I have this setup. Now lets say I am on branch1 folder (git bash), like c:\branch1\ and do a checkout master. It switches to master branch, but does not change the folder. So the folder I am in is not…
Kevin Rave
  • 11,992
  • 31
  • 97
  • 158
3
votes
7 answers

how do I manage source code using SVN? branching, merging

We are team of 4 developers/friends located in different locations. We all have started working on the a ProjectX and created branches A, B, C and D using Subversion. we have just basic knowledge of version controlling the source code. Other day one…
TigerTiger
  • 10,034
  • 13
  • 54
  • 71
3
votes
3 answers

Any drawbacks to SVN branch model: branch -> next-branch, abandoning trunk?

We have a release model which to keep things simple we'll say is 1 per month. So, we typically go: Jan -> trunk trunk -> Feb trunk <- Feb Mar <- trunk Mar -> trunk etc We are considering just abandoning trunk, giving a model…
Brian
  • 6,151
  • 3
  • 31
  • 47
3
votes
1 answer

Maintaining multiple branches of the same base project in VS

I've looked around the site but I couldn't find an answer that covers mine entirely, so please excuse me in advance if I missed it. I inherited a VB.NET project that didn't have source control (it started as a pet project of a long-gone dev and…
KalaNag
  • 175
  • 3
  • 14
3
votes
2 answers

Git Branching & merging workflow problems. How do you do it?

This is our development workflow: Developer works on an issue in a new topic branch. Once he is finished, he pushes the branch up for review. I merge the branch into a develop branch and push it upstream on the staging server. Client reviews the…
feketegy
  • 652
  • 1
  • 4
  • 17
1 2 3
…
99
100