Skip to content

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.

Signed-off-by: ailkiv <a.ilkiv.ye@gmail.com>
@AIlkiv
Copy link
Contributor Author

AIlkiv commented Mar 9, 2025

@max-nextcloud Hello. Just a reminder.

@juliusknorr
Copy link
Member

This looks good to me. @max-nextcloud Please still check I have not tried it yet.

@github-actions
Copy link
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. Also gave it a try. Works really nicely.

@max-nextcloud max-nextcloud merged commit ba632f1 into nextcloud:main Mar 14, 2025
65 checks passed
@max-nextcloud
Copy link
Collaborator

/backport to stable31

@max-nextcloud
Copy link
Collaborator

/backport to stable30

@max-nextcloud
Copy link
Collaborator

/backport to stable29

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

3 participants