1
1
Fork
You've already forked yml2
0

some-fixes #3

Open
htgoebel wants to merge 4 commits from some-fixes into master
pull from: some-fixes
merge into: fdik:master
fdik:master
fdik:pypackage
fdik:python3
htgoebel commented 2021年10月25日 10:57:56 +02:00 (Migrated from gitea.pep.foundation)
Copy link
  • yml2proc: Fix encoding error in debug output.
  • yml2proc: Enhance help.
  • Update URLs in setup.cfg.
  • Make "include" search relative file relative to include file.
* yml2proc: Fix encoding error in debug output. * yml2proc: Enhance help. * Update URLs in setup.cfg. * Make "include" search relative file relative to include file.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

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

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 master
git merge --no-ff some-fixes
git switch some-fixes
git rebase master
git switch master
git merge --ff-only some-fixes
git switch some-fixes
git rebase master
git switch master
git merge --no-ff some-fixes
git switch master
git merge --squash some-fixes
git switch master
git merge --ff-only some-fixes
git switch master
git merge some-fixes
git push origin master
Sign in to join this conversation.
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
fdik/yml2!3
Reference in a new issue
fdik/yml2
No description provided.
Delete branch "some-fixes"

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?