questions about branch

Git undo local branch delete

I just deleted the wrong branch with some experimental changes I need with git branch -D branchName. How do I recover the branch? ...

git

branch

git-branching

Is conditional branching a requirement of Turing-completeness?

I've been searching the web and I'm finding somewhat contradictory answers. Some sources assert that a language/machine/what-have-you is Turing complete if and only if it has both conditional and unconditional branching (which I guess is kind of redundant), some say that only unconditional is required, others that only conditional is req...

How to copy an old revision from another subversion branch to the head revision on trunk?

I have a repository where I have branched and merged back in some changes in to trunk. However I need to now revert trunk back to a revision on my branch. I imagine the solution is to use svn merge however I have not succesfully been able to use this accross branches. Any suggestions would be very useful. ...

svn

merge

branch

programming education tree

I was wondering, is there a some kind of infographic or tutorial out there that describes the various branching of programming education? Let me provide an example: I'd like to create a camera tracking program using, say, Intel IPP and Xcode. This is a pretty advanced project for a beginner, so I'd like to know what I have to know how t...

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 criticism. ...

git remote prune – what am I doing wrong?

From the man page: Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". So I removed a bunch of branches using git push origin :staleStuff and then ran git remote prune origin Howeve...

Is using “feature branches” compatible with refactoring?

“feature branches” is when each feature is developed in its own branch and only merged into the main line when it has been tested and is ready to ship. This allows the product owner to choose the features that go into a given shipment and to “park” feature that are part written if more important work comes in (e.g. a customer phones up...

Git: How to merge local branch with remote tracking automatically without fetching

Imagine, I have several branches: master, a, b, c ... Now I'm in master branch and "git pull". This fetches all changes from remote server into origin/master, origin/a, origin/b ... branches and merges CURRENT branch (master) with origin/master. But then I want to switch to A branch and again merge these remote changes from remote track...

Testing functionality without providing access to the whole code?

Suppose i outsource my existing php project for adding more functionality to it. I don't want to provide the whole code to the outsourced developer to protect my ip and idea. So say, using svn i create a branch for the project. And then put the code files that will need to be modified to add new functionality in that branch. Then how...

Svn: How to checkout some directory and still be able to update at root.

Is there a way to keep two branches from merging in git

I would like to be able to keep two separate branches in a git repo that cannot accidentally be merged even though the branches may contain similar content. Is there a trick for forcing a branch to remain separate in git? That is assuming I have branch A and branch B, something like git merge B //assuming A is checked out would fail. ...

Switching between Mercurial branches

If I look at Mercurial's site, it seems to tell me to use update -C to switch between branches. Another Stack Overflow answer says to use checkout instead. What are the differences? It seems to me that checkout updates the files in the working directory to the branch too, like update -C. ...

version-control

mercurial

branch

Working on multiple SVN branches in 1 Eclipse Workspace

Is it possible to have 1 workspace which contains different branched copies of the same project? Say I have Project1, and it is in this structure: /trunk/Project1 /branches/1/Project1 /branches/2/Project1 Can I have 3 instances of Project 1 in the same workspace, where each eclipse project points to either the trunk or one of any bran...