functor.systems/website
3
1
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

WIP: overhaul site using Hugo #1

Draft
youwen wants to merge 1 commit from overhaul into main
pull from: overhaul
merge into: functor.systems:main
Conversation 0 Commits 1 Files changed 56 +1666 -2
youwen commented 2025-06-21 02:32:25 -07:00
Owner
Copy link

For maintainability.

For maintainability.
youwen self-assigned this 2025-06-21 02:32:25 -07:00
This pull request has changes conflicting with the target branch.
  • .gitignore
  • flake.nix
View command line instructions

Checkout

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

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 overhaul
git switch overhaul
git rebase main
git switch main
git merge --ff-only overhaul
git switch overhaul
git rebase main
git switch main
git merge --no-ff overhaul
git switch main
git merge --squash overhaul
git switch main
git merge --ff-only overhaul
git switch main
git merge overhaul
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
youwen
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: functor.systems/website#1
No description provided.
Delete branch "overhaul"

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?