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.

Sign up for GitHub

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

Delete and modified are swapped in conflict resolution #190

Open

MattKang opened this issue Nov 7, 2023 · 1 comment

MattKang commented Nov 7, 2023

When resolving deleted file merge conflicts, the prompt text is incorrect. It currently reads:

"filename.txt" has been deleted on refs/heads/master and modified on the other branch.

Do you want to keep the modified version or delete it?

I believe this should instead read:

"filename.txt" has been deleted on refs/heads/feature and modified on the current branch.

Do you want to keep the modified version or delete it?

Owner

GitFiend commented Nov 7, 2023

Thanks for reporting this. I'll take a look.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment