CasahDev/PerryTel
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

WIP: feat/videotex #5

Draft
CasahDev wants to merge 2 commits from feat/videotex into dev
pull from: feat/videotex
merge into: CasahDev:dev
Conversation 0 Commits 2 Files changed 5 +190 -5
CasahDev commented 2026-07-12 02:07:04 +02:00
Owner
Copy link
No description provided.
CasahDev changed title from feat/videotex to WIP: feat/videotex 2026-07-30 23:45:02 +02:00
This pull request has changes conflicting with the target branch.
  • build.sh
  • kernel/main.c
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 feat/videotex:feat/videotex
git switch feat/videotex

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 dev
git merge --no-ff feat/videotex
git switch feat/videotex
git rebase dev
git switch dev
git merge --ff-only feat/videotex
git switch feat/videotex
git rebase dev
git switch dev
git merge --no-ff feat/videotex
git switch dev
git merge --squash feat/videotex
git switch dev
git merge --ff-only feat/videotex
git switch dev
git merge feat/videotex
git push origin dev
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.

Blocks
#6 WIP: feat/mosaique-mode
CasahDev/PerryTel
Reference
CasahDev/PerryTel!5
No description provided.