On Fri, Mar 23, 2012 at 9:20 PM, François Revol <revol@xxxxxxx> wrote: > If pull fails, git stash apply && git stash drop to reapply local stuff. git stash pop does the apply and drop in one operation. I use that most of the time. -- Regards, Ryan