On Fri, Mar 09, 2012 at 10:36:58AM -0500, Chris Wilper wrote: [snip] > The workflow I like to follow is: While the work is in a local branch, > commit early and often so I can rollback easily if I do something dumb > a couple hours from now. Then, before pushing to origin, do surgery on > the commits via "git rebase -i' so they're: > a) in good-sized, meaningful chunks for other people to grok. Ideally > each chunk adds something useful and is well-tested, especially if > you're merging to master. This is the point where you can 'squash' all > those 'minor tweak' commits so people reviewing your changes or > browsing the repo history down the road don't have to wade through all > of them.
This is a good point, and one that I hadn't considered (because I'm such a Git noob). Working with Git is different from working with e.g. SVN because push/pull carries along all of the intermediate history from your local repo, while 'svn diff' doesn't. I've been thinking in terms of committing once a day (lock my progress when I lock my desk) but that would often make for some puzzling history if shared. Gotta spend some more quality time with _Pro Git_ this weekend. I do tend to rely on my IDE's organic local history facility to protect me from small oopses during the day, rather than the VCS, but that may change. Something to think about. -- Mark H. Wood, Lead System Programmer mw...@iupui.edu Asking whether markets are efficient is like asking whether people are smart.
pgpfqFILpqdAL.pgp
Description: PGP signature
------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________ Dspace-devel mailing list Dspace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dspace-devel
