replace onlyoffice with colllabora #1

Open

willi.junga wants to merge 2 commits from willi.junga/schulung:main into main

pull from: willi.junga/schulung:main

merge into: norbert.tretkowski:main

norbert.tretkowski:main

Conversation 0 Commits 2 Files changed 1 +1 -1

willi.junga commented 2024-03-03 10:13:30 +01:00

First-time contributor

Copy link

hehe (:

hehe (:

willi.junga added 1 commit 2024-03-03 10:13:31 +01:00

replace onlyoffice with colllabora f257d0ed2a

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 main:willi.junga-main

git checkout willi.junga-main

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 willi.junga-main

git checkout willi.junga-main

git rebase main

git checkout main

git merge --ff-only willi.junga-main

git checkout willi.junga-main

git rebase main

git checkout main

git merge --no-ff willi.junga-main

git checkout main

git merge --squash willi.junga-main

git checkout main

git merge --ff-only willi.junga-main

git checkout main

git merge willi.junga-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

Subscribe

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: norbert.tretkowski/schulung#1

No description provided.