Granted, Subversion 1.5 just got a lot better, but branching/merges in git is so it there's not reason not to use it for every pile of changes you want to make (I just started git 2 days ago, might be wrong)
git checkout foo ...do work in same directory git checkout master
Switching between branches without adding (staging) applies the changes to the new branch automatically. You can also do
git checkout foo ...do work git commit -a git checkout master git pull . foo
I mean, it could be slimmer, but it certainly is painless branching/merging.
Branching/Merging
...do work in same directory
git checkout master
Switching between branches without adding (staging) applies the changes to the new branch automatically. You can also do
...do work
git commit -a
git checkout master
git pull . foo
I mean, it could be slimmer, but it certainly is painless branching/merging.