matercan/beer
1
0
Fork 0
forked from NotAShelf/beer
Code Pull requests 1 Activity

Config: Add italic and bold fonts #1

Open
matercan wants to merge 1 commit from matercan/config into italic_bold_fonts AGit
pull from: matercan/config
merge into: matercan:italic_bold_fonts
Conversation 0 Commits 1 Files changed 3 +60 -34
matercan commented 2026-06-27 09:21:01 +00:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • Cargo.toml
  • crates/beer/Cargo.toml
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 +refs/pull/1/head:matercan/config
git switch matercan/config

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 italic_bold_fonts
git merge --no-ff matercan/config
git switch matercan/config
git rebase italic_bold_fonts
git switch italic_bold_fonts
git merge --ff-only matercan/config
git switch matercan/config
git rebase italic_bold_fonts
git switch italic_bold_fonts
git merge --no-ff matercan/config
git switch italic_bold_fonts
git merge --squash matercan/config
git switch italic_bold_fonts
git merge --ff-only matercan/config
git switch italic_bold_fonts
git merge matercan/config
git push origin italic_bold_fonts
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
matercan/beer!1
No description provided.