[Javagit-codereview] code review request

[Ross S. <ros...@ny...>]

Hey gang, I made those changes related to how we create GitFile/ 
GitDirectory objects.  It's in review here:

http://linserv3.cims.nyu.edu:11000/cru/Javagit-4

Please throw me some feedback.  James - I haven't finished yours that  
I started Tuesday - will do so tomorrow, but if you'd like to just  
close it out and keep moving, that's a-okay by me.

Please note that I still haven't mastered the art of checking in just  
my stuff (I merged trunk into my code review branch, which had grown  
stale, and when I checked it all in, I got some of Max's changes in  
my commit too).  What should I have done in this case?

-- I made a new branch on Monday
-- I made my changes today
-- A bunch of changes were made between Monday and now to trunk
-- I merged head of trunk into my code review branch, which already  
had my changes
-- I resolved a bunch of conflicts
-- I committed the final product

Without something like a git-stash, how do I merge the updated trunk  
stuff into my branch and commit it in a separate commit without  
losing the work I've already done in my branch?