[plt-dev] git wackiness

That won't prevent you from getting the latest changes from the 
server(possibly having to rebuild), which is what Jay wanted to avoid.

If you create a branch before pulling you can get back to the pre-pull 
state.

Kevin

David Vanderson wrote:
> If you don't want to create a separate branch for this, you can do:
>
> git stash
> git pull --rebase
> git stash pop
>
> The stash command saves off the working tree differences temporarily.  
> That's how I've dealt with this so far.
>
> Thanks,
> Dave
>
> Jay McCarthy wrote:
>> tewk: This might work, git branch working_point; git pull --rebase ;
>> git push ; git checkout working_point
>> tewk: git branch saves your current view of the world, which you can
>> come back to after you update and commit
>>   
> _________________________________________________
>  For list-related administrative tasks:
>  http://list.cs.brown.edu/mailman/listinfo/plt-dev