teckids/Lillix-Kiwi
Watch
7
0
Fork
You've already forked Lillix-Kiwi
 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Workshop-Image GLT 2025 #4

Open
debdolph wants to merge 2 commits from glt-2025 into main
pull from: glt-2025
merge into: teckids:main
Conversation 2 Commits 2 Files changed 3 +31
debdolph commented 2025-04-22 13:17:03 +02:00 (Migrated from edugit.org)
Copy link
No description provided.
debdolph commented 2025-04-22 13:28:07 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 9f59d484 - Fix repo links

Compare with previous version

added 1 commit <ul><li>9f59d484 - Fix repo links</li></ul> [Compare with previous version](/Teckids/schul-frei/Lillix/-/merge_requests/3/diffs?diff_id=60275&start_sha=8f30400d711fbd89022e5338b3308d2ec50cb6dd)
debdolph commented 2025-04-22 13:28:44 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>1754c11c - Fix repo links</li></ul> [Compare with previous version](/Teckids/schul-frei/Lillix/-/merge_requests/3/diffs?diff_id=60277&start_sha=9f59d484d70d613547de33edbe929621bb70225a)
This pull request has changes conflicting with the target branch.
  • lillix-image/config.sh
  • lillix-image/lillix.kiwi
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 glt-2025:glt-2025
git switch glt-2025

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 glt-2025
git switch glt-2025
git rebase main
git switch main
git merge --ff-only glt-2025
git switch glt-2025
git rebase main
git switch main
git merge --no-ff glt-2025
git switch main
git merge --squash glt-2025
git switch main
git merge --ff-only glt-2025
git switch main
git merge glt-2025
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
To Do
No labels
Doing
To Do
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
teckids/Lillix-Kiwi!4
No description provided.