OSCloud/Blog-OSCloud
Watch
1
0
Fork
You've already forked Blog-OSCloud
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Seanovo #1

Draft
Archos wants to merge 10 commits from Oscloud/seanovo into main
pull from: Oscloud/seanovo
merge into: OSCloud:main
Conversation 0 Commits 10 Files changed 31 +1194 -132
Archos commented 2026-08-27 10:24:58 +00:00 (Migrated from git.arch-linux.cz)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • CHANGELOG.md
  • assets/css/site.css
  • build/build_blog.rb
  • lib/embed.rb
  • lib/import/jekyll.rb
  • lib/import/wayback.rb
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 Oscloud/seanovo:Oscloud/seanovo
git switch Oscloud/seanovo

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 Oscloud/seanovo
git switch Oscloud/seanovo
git rebase main
git switch main
git merge --ff-only Oscloud/seanovo
git switch Oscloud/seanovo
git rebase main
git switch main
git merge --no-ff Oscloud/seanovo
git switch main
git merge --squash Oscloud/seanovo
git switch main
git merge --ff-only Oscloud/seanovo
git switch main
git merge Oscloud/seanovo
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
OSCloud/Blog-OSCloud!1
No description provided.