xrdawson/webiphany-svekyll
1
0
Fork 0
Code Issues Pull requests 441 Projects Releases Packages Wiki Activity Actions

fun with arp caches #530

Open
xrdawson wants to merge 1 commit from enhanced_standardization into main
pull from: enhanced_standardization
merge into: xrdawson:main
Conversation 1 Commits 1 Files changed 1 +131
xrdawson commented 2025-10-17 15:30:03 +00:00 (Migrated from old.extrastatic.dev)
Copy link
No description provided.
xrdawson commented 2025-10-17 16:02:14 +00:00 (Migrated from old.extrastatic.dev)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b96f3e43 - fun with arp caches</li></ul> [Compare with previous version](/xrdawson/webiphany-svekyll/-/merge_requests/530/diffs?diff_id=4429&start_sha=964fdded123c7baf2e663d73c8ccb522bb552eeb)
This pull request has changes conflicting with the target branch.
  • content/posts/2025-10-18-fun-with-arp-caches.md
View command line instructions

Checkout

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

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 enhanced_standardization
git switch enhanced_standardization
git rebase main
git switch main
git merge --ff-only enhanced_standardization
git switch enhanced_standardization
git rebase main
git switch main
git merge --no-ff enhanced_standardization
git switch main
git merge --squash enhanced_standardization
git switch main
git merge --ff-only enhanced_standardization
git switch main
git merge enhanced_standardization
git push origin main
Sign in to join this conversation.
Reviewers
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
xrdawson/webiphany-svekyll!530
No description provided.