A "branch" is 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.
0
votes
0answers
4 views
TFS branch hangs after 2012 upgrade
We are having an issue branching a folder in a project after upgrading from TFS 2010 to TFS 2012 Update 1. If I try and branch a folder called 'Release' to a folder called anything else then it gets ...
0
votes
2answers
27 views
How to move git branch up tree (reverse rebase)
Say I have a series of commits that looks like this:
h {master}
^
f g {branch1}
^ ^
d e
^/
c
^
b
^
a
I know I can move the branch1 to the end of the tree via rebase, so it would look like this: ...
0
votes
0answers
7 views
How should I merge an SVN branch after migrating the repo to Git?
I migrated a SourceForge.net project from Subversion to Git using (mostly) the instructions at http://chris.iluo.net/blog/2009/08/28/moving-from-svn-to-git/.
It imported my branches and trunk ...
1
vote
1answer
35 views
Error: You have exceeded your disk space quota error message in git
When I try to push to my repositoty I see the following error message:
Error: You have exceeded your disk space quota.
Please upgrade your account or remove some data.
fatal: Could not read from ...
0
votes
2answers
16 views
Prevent pushing into a wrong remote branch
I want to have two branches locally (e.g. a-local and b-local) and two branches remotely (e.g. a-remote, b-remote), and they match in pairs (e.g. a-local - a-remote, etc). How do I make sure I don't ...
2
votes
4answers
73 views
Is it worth it to rewrite an if statement to avoid branching?
Recently I realized I have been doing too much branching without caring the negative impact on performance it had, therefore I have made up my mind to attempt to learn all about not branching. And ...
0
votes
1answer
11 views
TFS: Branch without check-in
I'm going to create a new (vc)project which will start as a copy of another project.
I want to have the possibility to simply merge changes between these two projects, although they are inside another ...
0
votes
1answer
15 views
svn diff last committed and last branched
I have created a branch and I have made a couple of commits.
I would like to see diff between last committed revision and version when the file was branched.
Can svn do that ?
0
votes
1answer
28 views
Assembly, PDP11, using ascii code to jump to specific label
I have a small question:
I have a subroutine that receives a letter (let's say "A") from the stack, and I want to jump to a label with the same name.
For example:
main: mov -(sp), r1
br r1
A: mov ...
1
vote
1answer
34 views
Rebase and changing branch is including all merged commits in pull request
I'm coming from a SVN background. I've forked and branched a git repository. Then I changed the branch (let's call it my-branch), committed, pushed and sent a Pull Request.
It happens that the ...
1
vote
1answer
29 views
Git-flow, some n00b questions
I have started to use git flow and have some questions.
In examples like here and here I see a release branch started and then several commits done before the release branch gets finished. Why is ...
0
votes
2answers
50 views
Git branching model problems
I'm implementing the successful git merging model by Vincent (http://nvie.com/posts/a-successful-git-branching-model/).
So I've a main repository "main" on our gitorious server with 2 main branches: ...
0
votes
1answer
25 views
How can I search path of folders where a particular git branch is created?
In Git, how could I search for path of directory where particular branch is created..?
Actually there is a git branch on which all the changes were carried out. Now i wanted to know on which ...
0
votes
3answers
38 views
Git: can't switch to new remote branch
I have an account on github and I use it from two different machines. On one, I created a new branch myNewBranch and switched to it. Then I did my modifications to my code, I committed and pushed to ...
1
vote
1answer
33 views
Can git permanently ignore a remote branch?
I'm using the Pages feature of GitHub. This works by putting the published HTML in a branch called gh-pages. I have two separate working directories, one for the project itself and one for the HTML ...
