dorian/test
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects 1 Releases 2 Packages 1 Wiki Activity Actions

patch-1 #3

Open
dorian wants to merge 3 commits from patch-1 into master
pull from: patch-1
merge into: dorian:master
Conversation 0 Commits 3 Files changed 1 +3 -8
dorian commented 2022-07-16 09:26:19 +02:00
Owner
Copy link

This PR closes #1

This PR closes #1
dorian added 3 commits 2022-07-16 09:26:19 +02:00 
# Conflicts:
#   README.md
This pull request has changes conflicting with the target branch.
  • README.md
View command line instructions

Checkout

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

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 master
git merge --no-ff patch-1
git checkout patch-1
git rebase master
git checkout master
git merge --ff-only patch-1
git checkout patch-1
git rebase master
git checkout master
git merge --no-ff patch-1
git checkout master
git merge --squash patch-1
git checkout master
git merge --ff-only patch-1
git checkout master
git merge patch-1
git push origin master
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: dorian/test#3
No description provided.
Delete branch "patch-1"

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?