fix(albums): Do not overwrite albums on move#3270
Conversation
Signed-off-by: Louis Chmn <[email protected]>
|
/backport to stable32 |
|
/backport to stable31 |
|
/backport to stable30 |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #3270 +/- ##
======================================
Coverage 2.21% 2.21%
======================================
Files 107 107
Lines 6586 6586
Branches 121 121
======================================
Hits 146 146
Misses 6435 6435
Partials 5 5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
/compile / |
Signed-off-by: nextcloud-command <[email protected]>
|
The backport to # Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/3270/stable30
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 0599a17a f1ba25f8
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3270/stable30Error: Failed to check for changes with origin/stable30: No changes found in backport branch 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 stable31
git pull origin stable31
# Create the new backport branch
git checkout -b backport/3270/stable31
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 0599a17a f1ba25f8
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3270/stable31Error: Failed to check for changes with origin/stable31: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
@artonge backport to 30 seems to fail, which is required by the requester/customer. |
|
@tobiasKaminsky ir was done from 31: #3273 |
|
Perfect. thanks! |
Else, the user completely lose the target album and its content.