Closed mgallien closed 1 week ago
AppImage file: nextcloud-PR-6827-03c48643a2450c462acab245a8aa9d5ca0dc44c8-x86_64.AppImage
To test this change/fix you can simply download above AppImage file and test it.
Please make sure to quit your existing Nextcloud app and backup your data.
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code
/backport to stable-3.12
The backport to stable-3.12
failed. Please do this backport manually.
# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12
# Create the new backport branch
git checkout -b backport/6827/stable-3.12
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 03c48643
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6827/stable-3.12
Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout: src/gui/macOS/ClientCommunicationProtocol.h Please commit your changes or stash them before you switch branches. Aborting
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.
@mgallien thx for that fix, it seems to work well with 3.12.6. Did it get merged into master as well? I can only find PRs for 3.13 (https://github.com/nextcloud/desktop/pull/6827) and 3.12 (https://github.com/nextcloud/desktop/pull/6828).
will ensure we do not erroneously use this instruction when we should not