djkato/n-mb
1
1
Fork 0
Code Issues 2 Pull requests 1 Projects Releases 2 Packages Wiki Activity Actions

fix non-mp4 file support #2

Open
accuwau wants to merge 1 commit from accuwau/changes into master
pull from: accuwau/changes
merge into: djkato:master
Conversation 0 Commits 1 Files changed 2 +30 -3
accuwau commented 2024-06-25 01:37:31 +00:00 (Migrated from github.com)
Copy link

not the cleanest but eh

not the cleanest but eh
This pull request has changes conflicting with the target branch.
  • Cargo.lock
  • src/encoder.rs
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff accuwau/changes
git checkout master
git merge --ff-only accuwau/changes
git checkout accuwau/changes
git rebase master
git checkout master
git merge --no-ff accuwau/changes
git checkout master
git merge --squash accuwau/changes
git checkout master
git merge --ff-only accuwau/changes
git checkout master
git merge accuwau/changes
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
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: djkato/n-mb#2
No description provided.
Delete branch "accuwau/changes"

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?