Siklos/forgejo-test
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Update a #1

Open
Siklos wants to merge 1 commit from b into main
pull from: b
merge into: Siklos:main
Conversation 0 Commits 1 Files changed 1 +1 -1
Siklos commented 2023-08-14 19:06:20 -04:00
Owner
Copy link
No description provided.
Siklos added 1 commit 2023-08-14 19:06:20 -04:00
This pull request has changes conflicting with the target branch.
  • a
View command line instructions

Checkout

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

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 b
git checkout b
git rebase main
git checkout main
git merge --ff-only b
git checkout b
git rebase main
git checkout main
git merge --no-ff b
git checkout main
git merge --squash b
git checkout main
git merge --ff-only b
git checkout main
git merge b
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: Siklos/forgejo-test#1
No description provided.
Delete branch "b"

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?