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

fix: resolve file version conflict during restore #6918

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

AIlkiv
Copy link
Contributor

@AIlkiv AIlkiv commented Feb 27, 2025

📝 Summary

  • Resolves: #

🖼️ Screenshots

When restoring a previous version, there is always a conflict. This fix removes the conflict for situations where there were no unsaved changes.

I made this fix via hook. So that you can backport to version 30.

The next step is to make a new PR for version 32, which will work through Event (I'm waiting for approval nextcloud/server#50990)

🚧 TODO

  • ...

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests
  • Documentation (README or documentation) has been updated or is not required

@max-nextcloud
Copy link
Collaborator

Thanks a lot @AIlkiv !
This has been bothering me as well. So far I was thinking about creating a frontend solution - but this seems far more simple.

I'm busy with other things for the rest of the week. But looking forward to try it out next week.

@AIlkiv AIlkiv force-pushed the fix/file-version-rollback branch from 7b44a34 to 940ebc3 Compare February 27, 2025 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restoring a version leads to a file conclict that remains unnoticed in read only mode
2 participants