From: Derrick Stolee Date: Wed, 08 Sep 2021 13:15:15 GMT Subject: Re: [PATCH 3/3] stash: restore untracked files AFTER restoring tracked files Message-ID: <53a16340-561b-dc67-5562-31d16460da84@gmail.com> In-Reply-To: On 9/7/2021 9:43 PM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > If a user deletes a file and places a directory of untracked files > there, then stashes all these changes, the untracked directory of files > cannot be restored until after the corresponding file in the way is > removed. So, restore changes to tracked files before restoring > untracked files. > > There is no similar problem to worry about in the opposite directory, s/directory/direction/ ? > because untracked files are always additive. Said another way, there's > no way to "stash a removal of an untracked file" because if an untracked > file is removed, git simply doesn't know about it. Makes sense. Thanks, -Stolee