Comenius-Institut/FOERBICO_und_rpi-virtuell
Comenius-Institut/FOERBICO_und_rpi-virtuell
14
6
Fork 3
Code Issues 187 Pull requests 11 Projects 12 Releases Wiki Activity

WIP: events/workshops/OER-Tools.md hinzugefügt #308

Draft
joerglohrer wants to merge 2 commits from oertools into main
pull from: oertools
merge into: Comenius-Institut:main
Conversation 0 Commits 2 Files changed 1 +36
joerglohrer commented 2025-03-11 16:52:54 +00:00
Owner
Copy link
No description provided.
joerglohrer added 1 commit 2025-03-11 16:52:55 +00:00
joerglohrer added 1 commit 2025-03-11 18:42:16 +00:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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

   
Blog

oer.community-Beitrag

  
CI

Comenius-Institut

  
Community-Hub

   
Duplikat

Dieses Issue oder dieser Pull-Request existiert bereits

  
Events

   
FAU

Friedrich-Alexander-Universität

  
Fehler / Bug

Etwas funktioniert nicht

  
GPEN

   
GU

Goethe-Universität

  
Hilfe gesucht

braucht Unterstützung

  
KI Strategie

   
MainWP

   
Materialpool

   
Offene Frage

Mehr Information benötigt

  
Team-Organisation

   
Terminiert

   
Verbesserung

Neues Feature

  
Webserver

Issues die mit dem Webserver (apache2, php-fpm etc.) zu tun haben

  
XWiki

   
efabi

   
gutes erstes Issue

Du willst mitmachen? Starte hier!

  
invalid

Something is wrong

  
keycloak

   
n8n

   
nostr

   
oer.community

FOERBICO-Webseite

  
relilab

   
relimentar

   
rpi-virtuell

   
technik

Dieses Label ist für technische Fragen gedacht, die insbesondere das Informatik-Team betreffen.

No labels
Bildungsserver
Blog
CI
Community-Hub
Duplikat
Events
FAU
Fehler / Bug
GPEN
GU
Hilfe gesucht
KI Strategie
MainWP
Materialpool
Offene Frage
Team-Organisation
Terminiert
Verbesserung
Webserver
XWiki
efabi
gutes erstes Issue
invalid
keycloak
n8n
nostr
oer.community
relilab
relimentar
rpi-virtuell
technik
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: Comenius-Institut/FOERBICO_und_rpi-virtuell#308
No description provided.
Delete branch "oertools"

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?