From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 17 May 2016 16:58:08 GMT
Subject: Re: [PATCH v2] Ignore dirty submodule states during stash
Message-ID: <CAPig+cSFD+4zhvxpqjGWomq1uW3JxCNi6pQP3f_bp4Tr1Kg5aA@mail.gmail.com>
In-Reply-To: <20160517131635.GA5299@gmail.com>

On Tue, May 17, 2016 at 9:16 AM, Vasily Titskiy <qehgt0@gmail.com> wrote:
> As stash does not know how to deal with submodules,
> it should not try to save/restore their states
> as it leads to redundant merge conflicts.
>
> Added test checks if 'stash pop' does not trigger merge conflics

/conflics/conflicts/

> in submodules.
>
> Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>