Fix error regarding applying of nodiscard to value type #6589
Conversation
|
/backport to stable-3.12 |
|
/backport to stable-3.13 |
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
camilasan
force-pushed
the
bugfix/false-error-nodiscard-on-value-type
branch
from
b5f851a to
eb291f4
Compare
|
AppImage file: nextcloud-PR-6589-eb291f42183fa525620ee8c7a4958fb8dd1a1b50-x86_64.AppImage |
|
The backport to # Switch to the target branch and update it
git checkout stable-3.13
git pull origin stable-3.13
# Create the new backport branch
git checkout -b backport/6589/stable-3.13
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick eb291f42
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6589/stable-3.13Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # 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/6589/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 eb291f42
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6589/stable-3.12Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout: Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
No description provided.