aurel1on/misskey_bot
2
1
Fork 0
Code Pull requests 1 Releases Activity

niho #2

Open
nihonium wants to merge 6 commits from niho into master
pull from: niho
merge into: aurel1on:master
Conversation 0 Commits 6 Files changed 5 +138 -129
nihonium commented 2022-08-14 22:51:54 +03:00
Collaborator
Copy link
No description provided.
nihonium added 6 commits 2022-08-14 22:51:57 +03:00
This pull request has changes conflicting with the target branch.
  • sources.md
View command line instructions

Checkout

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

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 niho
git checkout niho
git rebase master
git checkout master
git merge --ff-only niho
git checkout niho
git rebase master
git checkout master
git merge --no-ff niho
git checkout master
git merge --squash niho
git checkout master
git merge --ff-only niho
git checkout master
git merge niho
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: aurel1on/misskey_bot#2
No description provided.
Delete branch "niho"

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?