1
0
Fork
You've already forked website
0

WIP: add collaborators #7

Draft
davidbenque wants to merge 6 commits from roster into main
pull from: roster
merge into: IDS:main
IDS:main
IDS:pages
IDS:staging
No description provided.
davidbenque referenced this pull request from a commit 2024年12月12日 12:49:03 +01:00
This pull request has changes conflicting with the target branch.
  • about.md
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 roster:roster
git switch roster

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 main
git merge --no-ff roster
git switch roster
git rebase main
git switch main
git merge --ff-only roster
git switch roster
git rebase main
git switch main
git merge --no-ff roster
git switch main
git merge --squash roster
git switch main
git merge --ff-only roster
git switch main
git merge roster
git push origin main
Sign in to join this conversation.
No reviewers
No labels
Content
Dev
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
IDS/website!7
Reference in a new issue
IDS/website
No description provided.
Delete branch "roster"

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?