1
0
Fork
You've already forked bookcase-rs
0

feat: add support for PDF files #3

Open
Shadow53 wants to merge 1 commit from 1-pdf-format into main
pull from: 1-pdf-format
merge into: Shadow53:main
Shadow53:main

This is a pre-existing WIP branch that needs work before it can be merged.

This is a pre-existing WIP branch that needs work before it can be merged.
This pull request has changes conflicting with the target branch.
  • Cargo.lock
  • Cargo.toml
  • src/compression/zip/mod.rs
  • src/lib.rs
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 1-pdf-format:1-pdf-format
git switch 1-pdf-format

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 1-pdf-format
git switch 1-pdf-format
git rebase main
git switch main
git merge --ff-only 1-pdf-format
git switch 1-pdf-format
git rebase main
git switch main
git merge --no-ff 1-pdf-format
git switch main
git merge --squash 1-pdf-format
git switch main
git merge --ff-only 1-pdf-format
git switch main
git merge 1-pdf-format
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
Shadow53/bookcase-rs!3
Reference in a new issue
Shadow53/bookcase-rs
No description provided.
Delete branch "1-pdf-format"

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?