Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.13] Remove unecessary call to sendTransferInfo. #6887

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Jul 8, 2024

Backport of PR #6885

Possible fix for #6876.

Signed-off-by: Camila Ayres <[email protected]>
@backportbot backportbot bot added this to the 3.13.2 milestone Jul 8, 2024
@camilasan camilasan merged commit f0ab457 into stable-3.13 Jul 8, 2024
9 of 12 checks passed
@camilasan camilasan deleted the backport/6885/stable-3.13 branch July 8, 2024 12:22
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6887-fab527a52a0579347eca5ab84a05166b52dc46e5-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.

Copy link

sonarcloud bot commented Jul 8, 2024

@camilasan
Copy link
Member

/backport to stable-3.12

Copy link
Author

backportbot bot commented Jul 12, 2024

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/6887/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 fab527a5

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants