* Aborting a merge will delete new files added
@ 2017-12-01 11:58 Pärham FH
0 siblings, 0 replies; only message in thread
From: Pärham FH @ 2017-12-01 11:58 UTC (permalink / raw)
To: git
Hi!
While sorting out a merge conflict I accidentally added an untracked
folder to the index. Later I decided to abort the merge with `git
merge --abort` and I expected it to unstage the untracked file but it
instead removed it. This was not what I expected.
Cheers,
Pärham
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-12-01 11:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-01 11:58 Aborting a merge will delete new files added Pärham FH
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).