digitale-selbstverteidigung/digitale-selbstverteidigung-website
1
0
Fork 0
Code Issues Pull requests 4 Activity Actions

Video-Datei hochgeladen, in HTML-Seite eingebettet und im alten Termin-Post verlinkt #12

Open
lxndr wants to merge 1 commit from embed_webinar2_recording into master
pull from: embed_webinar2_recording
merge into: digitale-selbstverteidigung:master
Conversation 0 Commits 1 Files changed 3 +30
lxndr commented 2020-07-06 21:14:30 +02:00 (Migrated from gitlab.hamburg.ccc.de)
Copy link

Hi Dorle, bitte mal kurz schauen, ob das so passt, und wenn ja, einfach gleich reinmergen :)
LG, Alex

Hi Dorle, bitte mal kurz schauen, ob das so passt, und wenn ja, einfach gleich reinmergen :) LG, Alex
This pull request has changes conflicting with the target branch.
  • content/termine/2020-juni.md
View command line instructions

Checkout

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

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 master
git merge --no-ff embed_webinar2_recording
git switch embed_webinar2_recording
git rebase master
git switch master
git merge --ff-only embed_webinar2_recording
git switch embed_webinar2_recording
git rebase master
git switch master
git merge --no-ff embed_webinar2_recording
git switch master
git merge --squash embed_webinar2_recording
git switch master
git merge --ff-only embed_webinar2_recording
git switch master
git merge embed_webinar2_recording
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
digitale-selbstverteidigung/digitale-selbstverteidigung-website!12
No description provided.