Thread: Some git stuff
View Single Post
  #10  
Old 01-04-2014, 10:10 PM
demonstar55
Demi-God
  
Join Date: Apr 2008
Location: MA
Posts: 1,164
Default
If you stash things, update, then pop them from the stash. I believe it just merges the changes, which if there are no merge conflicts, should be painless.
Reply With Quote