From: Brian Gernhardt <benji@silverinsanity.com>
Date: Wed, 25 Feb 2009 17:05:54 GMT
Subject: Re: Files different for me
Message-ID: <7E43550E-68B7-4B22-A83C-F840A7037CA9@silverinsanity.com>
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E709E047DE@EXCHANGE.trad.tradestation.com>


On Feb 25, 2009, at 11:11 AM, John Dlugosz wrote:

> I'm working with a group, and using git for source code.  I need to  
> change a couple files temporarily and just for me.  I thought,  
> "that's easy", just don't stage them when I check in changes.  But,  
> what do I do when I pull changes from others?  I think it will  
> complain that I have unsaved changes.
> What's the best way to do this?

Generally when I keep changes like this, I make a commit called "Local  
Changes" or similar and have branch.master.rebase set to true so that  
my changes get rebased on top of origin when I pull.

~~ Brian