-
Notifications
You must be signed in to change notification settings - Fork 111
fix: resolve file version conflict during restore #6918
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
Conversation
|
Thanks a lot @AIlkiv ! 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>
7b44a34 to
940ebc3
Compare
|
@max-nextcloud Hello. Just a reminder. |
|
This looks good to me. @max-nextcloud Please still check I have not tried it yet. |
|
Hello there, 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.) |
max-nextcloud
left a comment
There was a problem hiding this 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.
|
/backport to stable31 |
|
/backport to stable30 |
|
/backport to stable29 |
π Summary
πΌοΈ 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
npm run lint/npm run stylelint/composer run cs:check)