LBRYCommunity/lbry-android-sdk
1
0
Fork 0
Code Issues 1 Pull requests 5 Projects Releases 26 Packages Wiki Activity

Upgrade p4a #19

Open
jessopb wants to merge 36 commits from upgrade_p4a into master
pull from: upgrade_p4a
merge into: LBRYCommunity:master
Conversation 0 Commits 36 Files changed 3445 +456206 -3803
jessopb commented 2022-12-03 06:06:31 +01:00 (Migrated from github.com)
Copy link
No description provided.
This pull request can be merged automatically.
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 upgrade_p4a:upgrade_p4a
git checkout upgrade_p4a

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 upgrade_p4a
git checkout upgrade_p4a
git rebase master
git checkout master
git merge --ff-only upgrade_p4a
git checkout upgrade_p4a
git rebase master
git checkout master
git merge --no-ff upgrade_p4a
git checkout master
git merge --squash upgrade_p4a
git checkout master
git merge --ff-only upgrade_p4a
git checkout master
git merge upgrade_p4a
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: LBRYCommunity/lbry-android-sdk#19
No description provided.
Delete branch "upgrade_p4a"

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?