BKI/simonsays_2425
17
0
Fork 14
Code Issues Pull requests 5 Projects Releases Packages Activity Actions

Silas, Herr Tress's imaginärer Freund findet, die Lösung abschreiben ist eine gute Idee! #13

Open
lummerle wants to merge 1 commit from lummerle/simonsays_2425:main into main
pull from: lummerle/simonsays_2425:main
merge into: BKI:main
Conversation 0 Commits 1 Files changed 1 +21 -2
lummerle commented 2025-07-08 15:21:01 +02:00
Member
Copy link

Silas hat auch immer Recht.

Silas hat auch immer Recht.
lummerle added 1 commit 2025-07-08 15:21:01 +02:00
This pull request has changes conflicting with the target branch.
  • SimonSaysProgramm/SimonSaysProgramm.ino
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:lummerle-main
git checkout lummerle-main

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff lummerle-main
git checkout lummerle-main
git rebase main
git checkout main
git merge --ff-only lummerle-main
git checkout lummerle-main
git rebase main
git checkout main
git merge --no-ff lummerle-main
git checkout main
git merge --squash lummerle-main
git checkout main
git merge --ff-only lummerle-main
git checkout main
git merge lummerle-main
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: BKI/simonsays_2425#13
No description provided.
Delete branch "lummerle/simonsays_2425:main"

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?