Bugfix/folder conflict disappear #6655
Conversation
allexzander
force-pushed
the
bugfix/folder-conflict-disappear
branch
2 times, most recently
from
dc38e80
to
d26b253
Compare
|
/backport to stable-3.13 |
|
/backport to stable-3.12 |
…d if it contains conflicted subfolers. Also fix crash with local rename. Signed-off-by: alex-z <[email protected]>
…cord if it contains conflicted subfolders. Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
allexzander
force-pushed
the
bugfix/folder-conflict-disappear
branch
from
d26b253
to
b52906a
Compare
|
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/6655/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 d240ed9d d2bfb59d 57f6c7cd 9ae60258 f490989a b52906a8
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6655/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. |
|
AppImage file: nextcloud-PR-6655-b52906a8a6ddc8f30547ca2e5a544c2c5d2625bd-x86_64.AppImage |
|
No description provided.