nextcloud / desktop

💻 Desktop sync client for Nextcloud
https://nextcloud.com/install/#install-clients
GNU General Public License v2.0
2.89k stars 771 forks source link

Bugfix/update encryption state when server change #6841

Closed mgallien closed 2 days ago

mgallien commented 2 days ago
mgallien commented 2 days ago

/backport to stable-3.12

mgallien commented 2 days ago

/backport to stable-3.13

backportbot[bot] commented 2 days ago

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/6841/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 284823d1 a270dca3 863256fd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6841/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.

nextcloud-desktop-bot commented 2 days ago

AppImage file: nextcloud-PR-6841-863256fd5503d73c140ba91f5cd2140de9c5f713-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.

sonarcloud[bot] commented 2 days ago

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud