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
Repository reset will not fix merge conflicts #11613
Comments
It seems to be a problem in the |
I've just tried it, and it works for me. Did you get any error? Did you check the server logs? |
This issue has been marked as a question by a Weblate team member. Why? Because it belongs more to the professional Weblate Care or community Discussions than here. We strive to answer these reasonably fast here, too, but purchasing the support subscription is more responsible and faster for your business. And it makes Weblate stronger as well. Thanks! In case your question is already answered, making a donation is the right way to say thank you! |
Thank you for your report; the issue you have reported has just been fixed.
|
Describe the issue
I got some merge conflicts in my project and since i had no changes in weblate I tried a reset of the repository. This did nothing and my projects still has some merge conflicts.
I also tried to add the reporitory again as new component but i also got a merge conflict on that new and freshly initialzed component.
I already tried
Steps to reproduce the behavior
Expected behavior
If I completly reset a repository there should not be a merge conflict
Screenshots
No response
Exception traceback
No response
How do you run Weblate?
Docker container
Weblate versions
weblate@3cd6a17078b4:/$ weblate list_versions
Weblate deploy checks
No response
Additional context
No response
The text was updated successfully, but these errors were encountered: