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

Local newsanchor's head is OK, but not the rest #528

Open
xrdawson wants to merge 1 commit from realigned_paradigm into main
pull from: realigned_paradigm
merge into: xrdawson:main
Conversation 0 Commits 1 Files changed 1 +49
xrdawson commented 2025-09-09 18:09:40 +00:00 (Migrated from old.extrastatic.dev)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • content/posts/2025-09-10-local-newsanchor-s-head-is-ok-but-not-the-rest.md
View command line instructions

Checkout

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

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 realigned_paradigm
git switch realigned_paradigm
git rebase main
git switch main
git merge --ff-only realigned_paradigm
git switch realigned_paradigm
git rebase main
git switch main
git merge --no-ff realigned_paradigm
git switch main
git merge --squash realigned_paradigm
git switch main
git merge --ff-only realigned_paradigm
git switch main
git merge realigned_paradigm
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!528
No description provided.