You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When rebasing, on a file deleted by them but modified by "ours", pressing - on the file in the Unstaged list causes the file to stay around instead of being removed (and the resolution of "keep" is staged)
It would make more sense for this to remove the file and stage that. Or do nothing, and indicate the required command. My understanding is that pressing - on any Unstaged item should stage it with the status indicated in the Unstaged list item, which for this file, is D. The only way to remove the file is to do 3X on it, or do X on the same file in the Staged list
The text was updated successfully, but these errors were encountered:
When rebasing, on a file
deleted by them
but modified by "ours", pressing-
on the file in theUnstaged
list causes the file to stay around instead of being removed (and the resolution of "keep" is staged)It would make more sense for this to remove the file and stage that. Or do nothing, and indicate the required command. My understanding is that pressing
-
on anyUnstaged
item should stage it with the status indicated in theUnstaged
list item, which for this file, isD
. The only way to remove the file is to do3X
on it, or doX
on the same file in theStaged
listThe text was updated successfully, but these errors were encountered: