dresche/git-playground
1
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity

Sebastian <begrüßung> #2

Open
sepi wants to merge 1 commit from sepi-test into main
pull from: sepi-test
merge into: dresche:main
Conversation 0 Commits 1 Files changed 1 +2 -1
sepi commented 2023-10-27 09:36:55 +00:00
Collaborator
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • test.md
View command line instructions

Checkout

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

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 sepi-test
git switch sepi-test
git rebase main
git switch main
git merge --ff-only sepi-test
git switch sepi-test
git rebase main
git switch main
git merge --no-ff sepi-test
git switch main
git merge --squash sepi-test
git switch main
git merge --ff-only sepi-test
git switch main
git merge sepi-test
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
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: dresche/git-playground#2
No description provided.
Delete branch "sepi-test"

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?