fix: resolve file version conflict during restore #6918
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 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
)