list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Jonathan Müller" <>
Subject: git add --intent-to-add and git stash
Date: Sun, 4 Oct 2020 20:53:23 +0200	[thread overview]
Message-ID: <> (raw)


when I try to `git stash` a file I have previously added using `git add 
--intent-to-add`, I get an `error: Entry 'X' not uptodate. Cannot 
merge.` error. I have to manually remove the file from the index, stash, 
and add it again after I've popped the stash.

Can `git stash` be taught to handle such files automatically?


                 reply	other threads:[~2020-10-04 18:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this inbox:

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).