wiki-cafe
/
federatedwiki
forked from coop-cloud/federatedwiki
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Keep up #2

Open
cgalo5758 wants to merge 10 commits from coop-cloud/federatedwiki:main into main
pull from: coop-cloud/federatedwiki:main
merge into: wiki-cafe:main
Conversation 0 Commits 10 Files Changed 10 +65 -90
cgalo5758 commented 2023-10-16 03:13:28 +00:00
Owner
Copy Link
No description provided.
cgalo5758 added 5 commits 2023-10-16 03:13:28 +00:00
3wordchant added 1 commit 2023-11-22 17:15:58 +00:00
3wordchant added 1 commit 2024-02-27 17:26:11 +00:00
3wordchant added 1 commit 2024-04-05 14:29:04 +00:00
3wordchant added 1 commit 2024-04-05 14:47:24 +00:00
3wordchant added 1 commit 2024-04-05 14:48:08 +00:00
This pull request has changes conflicting with the target branch.
  • .env.sample
  • abra.sh
  • compose.yml
  • config.initial.json.tmpl
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b coop-cloud-main main
git pull main

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff coop-cloud-main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
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: wiki-cafe/federatedwiki#2
No description provided.
Delete Branch "coop-cloud/federatedwiki:main"

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?