teckids/teckids-website
8
0
Fork 0
Code Issues 9 Pull requests 2 Projects Packages 1 Activity Actions

Resolve "Add content for Elektronik workshop" #118

Open
mwinter wants to merge 3 commits from 26-add-content-for-elektronik-workshop into master
pull from: 26-add-content-for-elektronik-workshop
merge into: teckids:master
Conversation 4 Commits 3 Files changed 1 +14
mwinter commented 2024-10-13 23:15:47 +02:00 (Migrated from edugit.org)
Copy link

Closes #26

Closes #26
mwinter commented 2024-10-14 20:16:30 +02:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
mwinter commented 2024-10-17 18:23:30 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 3f203772 - add description for electronics workshop
  • af309aab - review and imporve description for electronics workshop

Compare with previous version

added 2 commits <ul><li>3f203772 - add description for electronics workshop</li><li>af309aab - review and imporve description for electronics workshop</li></ul> [Compare with previous version](/Teckids/team-pr/teckids.org/-/merge_requests/80/diffs?diff_id=48919&start_sha=a55fdd267b697bdc7534e0d343b254461d4157f6)
mwinter commented 2024-10-17 18:28:58 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b9d887b5 - fix link</li></ul> [Compare with previous version](/Teckids/team-pr/teckids.org/-/merge_requests/80/diffs?diff_id=48921&start_sha=af309aaba71b05c6e96a5fe1992f45e55d96ef3b)
mwinter commented 2024-10-17 18:33:43 +02:00 (Migrated from edugit.org)
Copy link

assigned to @debdolph

assigned to @debdolph
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 26-add-content-for-elektronik-workshop:26-add-content-for-elektronik-workshop
git switch 26-add-content-for-elektronik-workshop

Merge

Merge the changes and update on Forgejo.
git switch master
git merge --no-ff 26-add-content-for-elektronik-workshop
git switch 26-add-content-for-elektronik-workshop
git rebase master
git switch master
git merge --ff-only 26-add-content-for-elektronik-workshop
git switch 26-add-content-for-elektronik-workshop
git rebase master
git switch master
git merge --no-ff 26-add-content-for-elektronik-workshop
git switch master
git merge --squash 26-add-content-for-elektronik-workshop
git switch master
git merge --ff-only 26-add-content-for-elektronik-workshop
git switch master
git merge 26-add-content-for-elektronik-workshop
git push origin master
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
teckids/teckids-website!118
No description provided.