On Thu, Mar 9, 2017 at 2:51 PM, Ryan Schmidt <[email protected]>
wrote:

> Why won't it automatically stash? Usually it does, but apparently not when
> there are conflicts.


The manpage for git pull warns that --autostash has edge cases/restrictions.

-- 
brandon s allbery kf8nh                               sine nomine associates
[email protected]                                  [email protected]
unix, openafs, kerberos, infrastructure, xmonad        http://sinenomine.net

Reply via email to