pleroma/pleroma.social
0
0
Fork 0
Code Issues 10 Pull requests 5 Projects Releases Packages Wiki Activity

index: Add disclaimer on instance list #98

Open
lanodan wants to merge 1 commit from gitlab-mr-iid-83 into master
pull from: gitlab-mr-iid-83
merge into: pleroma:master
Conversation 0 Commits 1 Files changed 1 +5 -2
lanodan commented 2023-07-05 21:53:51 +00:00
Owner
Copy link
No description provided.
👍 1
This pull request has changes conflicting with the target branch.
  • source/index.xhtml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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 gitlab-mr-iid-83
git switch gitlab-mr-iid-83
git rebase master
git switch master
git merge --ff-only gitlab-mr-iid-83
git switch gitlab-mr-iid-83
git rebase master
git switch master
git merge --no-ff gitlab-mr-iid-83
git switch master
git merge --squash gitlab-mr-iid-83
git switch master
git merge --ff-only gitlab-mr-iid-83
git switch master
git merge gitlab-mr-iid-83
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Graphics

   
Legal
Things like licensing

No labels
Graphics
Legal
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
pleroma/pleroma.social!98
No description provided.