[stable-3.1] Ensure a sync happens after a conflict resolution #2717
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
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
requested review from
allexzander,
camilasan,
DominiqueFuchs,
er-vin and
sbeyer
camilasan
approved these changes
Dec 15, 2020
|
/rebase |
You'd expect that after a conflict resolution the file watcher would pick up the change and trigger a sync. For some reason it doesn't seem to happen on at least some Ubuntu systems. In such cases the user would then still have a stale conflict entry in the activity list and wouldn't be able to do anything with it. Signed-off-by: Kevin Ottens <[email protected]>
github-actions
bot
force-pushed
the
backport/2714/stable-3.1
branch
from
3e511a1 to
9774b6a
Compare
|
AppImage file: Nextcloud-PR-2717-9774b6a429112545ad4bca04ae5788d21af225ce-x86_64.AppImage |
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.
backport of #2714