2
5
Fork
You've already forked restricted
0

WIP: Plan9 restriction calls implementation #5

Draft
removewingman wants to merge 2 commits from plan9 into main
pull from: plan9
merge into: removewingman:main
removewingman:main
removewingman:freebsd
No description provided.
This pull request has changes conflicting with the target branch.
  • README.md
  • lib/restricted.ml
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 plan9:plan9
git switch plan9

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 plan9
git switch plan9
git rebase main
git switch main
git merge --ff-only plan9
git switch plan9
git rebase main
git switch main
git merge --no-ff plan9
git switch main
git merge --squash plan9
git switch main
git merge --ff-only plan9
git switch main
git merge plan9
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
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
removewingman/restricted!5
Reference in a new issue
removewingman/restricted
No description provided.
Delete branch "plan9"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?