Git autostash doesn't

[Brandon Allbery]

On Thu, Mar 9, 2017 at 2:51 PM, Ryan Schmidt <ryandesign at macports.org>
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
allbery.b at gmail.com                                  ballbery at sinenomine.net
unix, openafs, kerberos, infrastructure, xmonad        http://sinenomine.net
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20170309/cf350be2/attachment.html>