zotify-dev/zotify
1
0
Fork 0
Code Issues 199 Pull requests 18 Projects Releases Packages Wiki Activity Actions

Various Fixes for bugs #20

Open
rathmerdominik wants to merge 6 commits from rathmerdominik/v1.0-dev into v1.0-dev
pull from: rathmerdominik/v1.0-dev
merge into: zotify-dev:v1.0-dev
Conversation 0 Commits 6 Files changed 4 +28 -4
rathmerdominik commented 2023-08-28 06:38:52 -04:00 (Migrated from github.com)
Copy link
No description provided.
👍 1
This pull request has changes conflicting with the target branch.
  • zotify/file.py
  • zotify/logger.py
  • zotify/playable.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rathmerdominik/v1.0-dev:rathmerdominik/v1.0-dev
git switch rathmerdominik/v1.0-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 v1.0-dev
git merge --no-ff rathmerdominik/v1.0-dev
git switch rathmerdominik/v1.0-dev
git rebase v1.0-dev
git switch v1.0-dev
git merge --ff-only rathmerdominik/v1.0-dev
git switch rathmerdominik/v1.0-dev
git rebase v1.0-dev
git switch v1.0-dev
git merge --no-ff rathmerdominik/v1.0-dev
git switch v1.0-dev
git merge --squash rathmerdominik/v1.0-dev
git switch v1.0-dev
git merge --ff-only rathmerdominik/v1.0-dev
git switch v1.0-dev
git merge rathmerdominik/v1.0-dev
git push origin v1.0-dev
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
zotify-dev/zotify!20
No description provided.