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.

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

Jump to bottom

Revert command does not work with Git anymore #399

Open
alexx2000 opened this issue Mar 31, 2024 · 1 comment
Open

Revert command does not work with Git anymore #399

alexx2000 opened this issue Mar 31, 2024 · 1 comment

Comments

@alexx2000
Copy link

alexx2000 commented Mar 31, 2024 •
edited

After some system update the revert command does not work with Git anymore. It gives error:

fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree

Tested with the latest RabbitVCS from master branch.

git version 2.44.0
@AlexNk
Copy link

AlexNk commented May 25, 2024

Same problem.
Git v. 2.43.0

Apparently, introduced by this commit

git/git@54f98fe

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@AlexNk @alexx2000