derivelinux/ports
5
13
Fork
You've already forked ports
16

main: read commits log #133

Open
tecknian wants to merge 7 commits from tecknian/ports:main into main
pull from: tecknian/ports:main
merge into: derivelinux:main
derivelinux:main
derivelinux:experimental
derivelinux:dep-types
derivelinux:chld-main
derivelinux:kati
Contributor
Copy link
No description provided.
Author
Contributor
Copy link

img2b is removed

img2b is removed
This pull request has changes conflicting with the target branch.
  • core/bearssl/ndmake.sh
  • core/tzcode/files/tzdir.h
  • core/tzcode/ndmake.sh
  • utils/imagemagick/ndmake.sh
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 main:tecknian-main
git switch tecknian-main

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 tecknian-main
git switch tecknian-main
git rebase main
git switch main
git merge --ff-only tecknian-main
git switch tecknian-main
git rebase main
git switch main
git merge --no-ff tecknian-main
git switch main
git merge --squash tecknian-main
git switch main
git merge --ff-only tecknian-main
git switch main
git merge tecknian-main
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
derivelinux/ports!133
Reference in a new issue
derivelinux/ports
No description provided.
Delete branch "tecknian/ports:main"

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?