I've tried git branch -r, but that only lists remote branches that I've tracked locally. How do I find the list of those that I haven't? (It doesn't matter to me whether the command lists all remote branches or only those that are untracked.) ...
I've got a (sparse) development branch in Perforce which I keep up to date regularly with the main code line. I'd like a simple way to list all the non-integration changes which have been made to the branch, ideally checked out into a new changelist (to allow me to do final code-tidyups before merging back to the main code line). The on...
Okay I almost have this rebase thing figured out. I can feel a breakthrough coming - here is the tipping point: How do I do a rebase to go from: A - - B - - C - - D - - E (HEAD) | \ - - F - - G (branch1) To: A - - B - - C - - D - - E (HEAD) | \ - - F - - G (branch1) I don't just want to merge H...
Our small team (6) development team is comprised of individuals with varying skill levels and product knowledge. To protect ourselves from ourselves (or lack of experience) what branching policy should we use? ...
I am running Visual Source Safe 8.0. I am trying to create 2 branches for my project, but I find that the branch option is dialed in the versions menu. Can anyone tell me how to enable it. ...
Summary I currently have a NAnt build script that performs a vssget on either the latest source code, or a specific branch (using a ${branch} parameter). Whenever we do a production build/deployment the code-tree that was built has a branch created, (so that we can continue development and still know what codebase is on production, pret...
Once you have finished/reintegrated a branch, is it best practice to delete the branch so your head branches folder only shows current branches? If so, what would be a suitable time to delete reintegrated branches? After a minor release (which is when we tag). Cheers ...
Our SCM is Subversion. And I don't know how to handle this scenario. Let's say the I have these branches: DEVELOPMENT (trunk) QA PRODUCTION In the trunk we have the following features (F): F1 F2 F3 F1 and F2 are ready to be tested on the QA environment so the changes corresponding to those features get merged into the QA branch....
We just upgraded to TFS 2010. We created a development branch for each project. If changes are made in Branch1 and then Branch1 is merged back into the baseline, it merges every file instead of just the changed files. Subsequent changes to files in Branch1 and then merging to the baseline result in only those changes being merged (which...
Hello, I'm using git as an interface to an SVN repository. Now I've created a SVN branch: git svn branch my_branch This created the directory in my SVN repository, and also created a branch called remotes/my_branch. Then I've deleted that remote tracking branch: git branch -r -d my_branch Now the directory is still there in the SV...
Basically, what I want to try is pulling hg revisions from a branch of an experimental repo into a clone of mainline. But I want to discard the branch name so I can push directly into the server-side mainline repo. It's probably best to give a simple example: hg init hg_mainline pushd hg_mainline touch foo hg add foo hg commit -m 'fo...
Unless I am missing something very obvious, I don't see how I can branch on CodePlex using SVN. I'm looking at the popular projects and can't see anything about a trunk or branches. What am I missing? Also, I'm using TortoiseSVN. ...
I'm on a project where we're using a lot of branches. The eclipse History tab has columns for Revision, Tags, Author Comment, and Revision Time. There's no column to indicate the branch a commit is against. Now I can work this out sometimes by finding which revision a branch was branched from, but this is painfully slow sometimes, and so...
Creating a branch for various topics, and not regularly deleting them when I don't need them any more, I have now ended up with about 50 branches ;) I tried deleting branches and some of them have unmerged changes. What I want is the ability to see exactly what changes are there in any branch on my repo that are not in the master. Is t...
Hello, I'm using git-svn to track multiple branches in the same svn repository. Usually this works fine, but today I've done some resets and rebases, and suddenly my branches wouldn't dcommit to the right remote branch anymore: $ git branch * master a b $ git svn dcommit -n Committing to svn://server/repo/trunk ... $ git checkout...
I'd like to know more about the advantages and disadvantages of forking a github project vs. creating a branch of a github project. Forking makes my version of the project more isolated from the original one because I don't have to be on the collaborators list of the original project. Since we're developing a project in house, there is ...
What are the advantages/disadvantages of Branch per Release versus Code-Promotion Branches strategies? ...
After creating a branch with --track (or leaving the default, or --notrack), you later wish to be reminded of what a branch is tracking. Is there a way, other than searching through the .git/config file, to display what a branch is tracking? ...
I maintain a project that is versioned with Mercurial and managed with Maven. When we released version 1.0, we cloned a release repository that would contain bugfixes and continued development on the main repository. The release repo had version 1.0 in the POM while the development repo had version 1.1-SNAPSHOT. Now, how can I pull bu...
We have to keep 2 product versions. Now, some changes in each version have to be backported to another version. In SVN, if I made "change" to version 1, I merge this revision to version 2 and give comment like: "Merged 'change' from v1". This is awkward in many ways. Even worse if I merge several changes. Can git help me to have singl...