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

[stable28] Update Psalm to 5.9 to sync with server #2695

Merged
merged 5 commits into from
Jan 2, 2024

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Dec 21, 2023

Backport #2646 to 28

@come-nc come-nc added the 3. to review Items that need to be reviewed label Dec 21, 2023
@come-nc come-nc self-assigned this Dec 21, 2023
@come-nc
Copy link
Contributor Author

come-nc commented Dec 21, 2023

Included #2634 as well to fix CI

@come-nc come-nc requested a review from artonge December 21, 2023 14:13
@come-nc come-nc enabled auto-merge December 21, 2023 14:17
@come-nc come-nc requested a review from skjnldsv January 2, 2024 11:09
@come-nc come-nc merged commit 448955f into stable28 Jan 2, 2024
20 checks passed
@come-nc come-nc deleted the backport/2646/stable28 branch January 2, 2024 11:34
@come-nc
Copy link
Contributor Author

come-nc commented Jan 11, 2024

/backport to stable27

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable27

Error: Unknown error

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
3. to review Items that need to be reviewed backport-request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants