On Fri, Feb 22, 2008 at 06:37:14PM -0600, Chase Venters wrote: > My question is: If you're working on multiple things at once, do you tend to > clone the entire repository repeatedly into a series of separate working > directories and do your work there, then pull that work (possibly comprising > a series of "temporary" commits) back into a separate local master > respository with --squash, either into "master" or into a branch containing > the new feature? > > Or perhaps you create a temporary topical branch for each thing you are > working on, and commit arbitrary changes then checkout another branch when > you need to change gears, finally --squashing the intermediate commits when a > particular piece of work is done? I favor the second approach: single working copy, multiple branches. My feeling is that wanting multiple workspaces is a holdover from using subversion. For me, it is much faster to "git commit -a -m wip" and then switch branches, than it would be to clone a whole new repository and manage the inter-repository relationships. Don't get so down on the "intermediate commits," either. For one, whenever I switch back to a branch with a "wip" commit, I usually do a "git reset HEAD^" to remove it and get my working tree back where it was. There are also nifty tools like interactive rebase that assist you in rewriting history to produce a set of clean, atomic commits. It's not imperative to make your first draft perfection in git. [...] > Insight appreciated, and I apologize if I've failed to RTFM somewhere. No worries, I remember being in your situation once. git opens up a host of opportunities with its flexibility, and getting started I was consistently stumped by which of the many paths I should choose. -- -Steven Walter <stevenrwalter@xxxxxxxxx> Freedom is the freedom to say that 2 + 2 = 4 B2F1 0ECC E605 7321 E818 7A65 FC81 9777 DC28 9E8F - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
