Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unintuitive behavior of - on (theirs) deleted file when rebasing #2226

Open
ivangreene opened this issue Oct 9, 2023 · 0 comments
Open

Unintuitive behavior of - on (theirs) deleted file when rebasing #2226

ivangreene opened this issue Oct 9, 2023 · 0 comments

Comments

@ivangreene
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant