Conflict fixes #3972
Merged
Conflict fixes #3972
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 flaky tests on run #9199 ↗︎
Details:
|
|||||||||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Sync > recovers from a lost connection |
Output
Screenshots
|
|
share.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Open test.md in viewer > Share a file with download disabled shows an error |
Output
Screenshots
|
|
conflict.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Open test.md in viewer > resolves conflict using current editing session |
Output
Screenshots
|
|
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.
juliusknorr
commented
Mar 21, 2023
| @@ -561,10 +563,6 @@ export default { | |||
| }, | |||
|
|
|||
| onChange({ document, sessions }) { | |||
| if (this.document.baseVersionEtag !== '' && document.baseVersionEtag !== this.document.baseVersionEtag) { | |||
There was a problem hiding this comment.
This behaviour is no longer valid and should be handled more gracefully as per #3963
juliusknorr
force-pushed
the
bugfix/noid/conflict
branch
from
9d3694a to
9bfac57
Compare
juliusknorr
force-pushed
the
bugfix/noid/conflict
branch
from
9bfac57 to
538d05b
Compare
|
/backport to stable26 |
|
Will check the cypress test tomorrow, seems we should await the sync request after pushing the state as it passed before my squashing push. |
juliusknorr
force-pushed
the
bugfix/noid/conflict
branch
from
538d05b to
e879ad0
Compare
mejo-
approved these changes
Mar 23, 2023
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
…solution Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
bugfix/noid/conflict
branch
from
e879ad0 to
eeca470
Compare
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Couple of fixes around conflict handling and file save, split into individual commits for easier review:
There is still some work left that probably involves design work to come up with better handling of the conflict display on mobile devices, but that is left out for now to have a more easily back portable change.
📝 Summary
🖼️ Screenshots
🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)