Replies: 1 comment
-
I have the same issue. Not sure how to keep the file deleted. |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Sometimes it happens that I rebase a branch and there's a conflict where my branch has edited some file, but that file was recently deleted from the branch I'm rebasing onto. How do I "accept the deletion" of this file?
If press
Space
, then I stage my file as it in my branch. If I press discard, same thing happens, I restore "my version", which is not what I want. I always have to drop down to another terminal and dogit rm file
manually.There's a similar discussion #2394, but it's not exactly the same. That sounds more generic to me, this is just in the context of fixing a rebase conflict. Don't know if it makes any difference.
Beta Was this translation helpful? Give feedback.
All reactions