oSoWoSo/vb
5
1
Fork
You've already forked vb
0

dev #1

Open
zenobit wants to merge 3 commits from dev into main
pull from: dev
merge into: oSoWoSo:main
oSoWoSo:main
oSoWoSo:x
oSoWoSo:zenobit-patch-1
No description provided.
This pull request has changes conflicting with the target branch.
  • .woodpecker.yml
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 dev:dev
git switch dev

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 dev
git switch dev
git rebase main
git switch main
git merge --ff-only dev
git switch dev
git rebase main
git switch main
git merge --no-ff dev
git switch main
git merge --squash dev
git switch main
git merge --ff-only dev
git switch main
git merge dev
git push origin main
Sign in to join this conversation.
No reviewers
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
oSoWoSo/vb!1
Reference in a new issue
oSoWoSo/vb
No description provided.
Delete branch "dev"

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?