services/octohook
Watch
2
0
Fork
You've already forked octohook
 0
forked from Mirrors/octohook
Code Issues 1 Pull requests 1 Activity Actions

dummy pr ignore #2

Open
lillith wants to merge 2 commits from feat/ci into main
pull from: feat/ci
merge into: services:main
Conversation 0 Commits 2 Files changed 2 +32 -1
lillith commented 2026-09-02 13:55:11 -04:00
Owner
Copy link
No description provided.
All checks were successful
Deploy / deploy (push) Successful in 25s
Details
This pull request has changes conflicting with the target branch.
  • .github/workflows/deploy.yml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/ci:feat/ci
git switch feat/ci

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/ci
git switch feat/ci
git rebase main
git switch main
git merge --ff-only feat/ci
git switch feat/ci
git rebase main
git switch main
git merge --no-ff feat/ci
git switch main
git merge --squash feat/ci
git switch main
git merge --ff-only feat/ci
git switch main
git merge feat/ci
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

   
size-L

   
size-M

   
size-S

   
size-XL

   
task
No labels
bug
size-L
size-M
size-S
size-XL
task
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
services/octohook!2
No description provided.