Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2026


This is an automatic backport of pull request #5011 done by [Mergify](https://mergify.com).

(cherry picked from commit bb788d7)

# Conflicts:
#	press/press/doctype/site/site.py
@mergify mergify bot added the conflicts label Feb 9, 2026
@mergify mergify bot added the conflicts label Feb 9, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Feb 9, 2026

Cherry-pick of bb788d7 has failed:

On branch mergify/bp/master/pr-5011
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bb788d774.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   press/press/doctype/site/site.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant