The main feature all VCS use for the various task you are mentioning is branching: the ability to isolate a development effort in a collaborative way. Since it is a Central VCS, several developers can collaborate on a same branch, with pessimistic or optimistic locks on files, in order to develop a parallel history. But … Read more
Just like GitHub, you have to pull the commits down to your own machine, merge, and then push them back to your fork on Bitbucket. If you go to your fork on Bitbucket you can click “compare fork” to get to a page where you see incoming and outgoing commits. If you go to the … Read more
I just found out about NuGetPowerTools: https://github.com/davidfowl/NuGetPowerTools Also see: http://blog.davidebbo.com/2011/08/easy-way-to-set-up-nuget-to-restore.html Update: NuGet 1.6 now supports Package Restore: http://docs.nuget.org/docs/release-notes/nuget-1.6
The best means of integrating svn externals with git-svn that I’ve seen is this script, which clones your externals into a .git_externals/ directory and creates the symlinks and exclude files you need. I find this a simple and direct solution. YMMV. Here is an older overview of other options for dealing with svn externals with … Read more
I have just introduced a DVCS (Git in this case) in a large banking company, where Perforce, SVN or ClearCase was the centralized VCS of choices: I already knew of the challenges (see my previous answer “Can we finally move to DVCS in Corporate Software? Is SVN still a ‘must have’ for development?”) I have … Read more
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
There are many scenarios here where you might want to do this, I’ll make each scenario a headline, so that you can find the scenario that fits your case. Note that I’m still learning Mercurial, and I’d like pointers if something I say is wrong, using the wrong terminology, could be done better, etc. No … Read more
The short answer is no, it doesn’t seem to exist. As you can read in a Quora article, “it’s hard to tell where the version control system ends, and where some of the other parts of the development toolchain begin”. So, first, you need to be clear in what “features” you are interested in since … Read more
Personally, I use $ rm **/*.orig if I get tired of the .orig files. This works in Zsh and in Bash 4 after you run shopt -s globstar. But if you use another shell or want a built-in solution, then maybe you’ll like the purge extension (link updated 2016-08-25). That lets you remove all untracked … Read more
You can use git difftool to show a single commit. Say you want to see the commit with the sha1 abc123: git difftool abc123~1 abc123 (~1 tells git to move to the previous commit, so abc123~1 is the commit before abc123) If you use this regularly, you could make a custom git command to make … Read more