Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jul 6, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #2496

@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Jul 6, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 24.0.3 milestone Jul 6, 2022
@mejo-
Copy link
Member

mejo- commented Jul 6, 2022

/rebase

@nextcloud-command nextcloud-command force-pushed the backport/2496/stable24 branch from 722878e to e3e6e9b Compare July 6, 2022 11:25
@mejo-
Copy link
Member

mejo- commented Jul 6, 2022

/compile amend

Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the backport/2496/stable24 branch from e3e6e9b to 30ca25f Compare July 6, 2022 11:28
@mejo- mejo- merged commit 9d54f32 into stable24 Jul 6, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/2496/stable24 branch July 6, 2022 11:46
@blizzz blizzz mentioned this pull request Jul 6, 2022
18 tasks
@max-nextcloud
Copy link
Collaborator

/backport 30ca25f to stable23

@max-nextcloud
Copy link
Collaborator

/backport e3e6e9b to stable23

@backportbot-nextcloud
Copy link
Author

The backport to stable23 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable23
git pull origin stable23

# Create the new backport branch
git checkout -b fix/foo-stable23

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

1 similar comment
@backportbot-nextcloud
Copy link
Author

The backport to stable23 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable23
git pull origin stable23

# Create the new backport branch
git checkout -b fix/foo-stable23

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants