LBRYCommunity/hub
Watch
1
0
Fork
You've already forked hub
 0
Code Issues 35 Pull requests 6 Projects Releases Packages Wiki Activity

add channel sponsor #106

Open
jessopb wants to merge 1 commit from add-channel-sponsor into master
pull from: add-channel-sponsor
merge into: LBRYCommunity:master
Conversation 1 Commits 1 Files changed 2 +5 -2
jessopb commented 2022-10-17 15:43:11 +02:00 (Migrated from github.com)
No description provided.
jackrobison (Migrated from github.com) approved these changes 2023-01-13 19:50:46 +01:00
This pull request has changes conflicting with the target branch.
  • hub/herald/env.py
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 "add-channel-sponsor:add-channel-sponsor"
git switch "add-channel-sponsor"

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 "add-channel-sponsor"
git switch "add-channel-sponsor"
git rebase "master"
git switch "master"
git merge --ff-only "add-channel-sponsor"
git switch "add-channel-sponsor"
git rebase "master"
git switch "master"
git merge --no-ff "add-channel-sponsor"
git switch "master"
git merge --squash "add-channel-sponsor"
git switch "master"
git merge --ff-only "add-channel-sponsor"
git switch "master"
git merge "add-channel-sponsor"
git push origin "master"
Sign in to join this conversation.
Reviewers
No reviewers
jackrobison
Labels
Clear labels   
area: database

   
area: documentation
Improvements or additions to documentation

  
area: elasticsearch

   
area: herald

   
area: packaging

   
area: scribe

   
consider soon
Discuss this issue at the next planning meeting, then remove this label

  
critical

   
dependencies
Pull requests that update a dependency file

  
good first issue
Good for newcomers

  
hacktoberfest
Welcome to Hacktoberfest

  
help wanted
Extra attention is needed

  
improvement

   
needs: repro
Needs a way to reproduce

  
new feature

   
priority: blocker
Issue is blocking release, do ASAP

  
priority: high
Work needs to be moved into sprint ASAP

  
priority: low
Work should be done but can stay in the backlog for now

  
priority: medium
Work needs to be done within 2-3 sprints

  
type: bug
Existing functionality is wrong or broken

  
type: bug-fix

   
type: discussion
A conversation. No specific changes requested

  
type: feature request

   
type: improvement
Existing (or partially existing) functionality needs to be changed

  
type: new feature
New functionality that does not exist yet

  
type: refactor
Minimal user-visible changes, but significant internal work

  
type: task
Either work that's not related to the code, or a small chore that does not fit into other categories

No labels
area: database
area: documentation
area: elasticsearch
area: herald
area: packaging
area: scribe
consider soon
critical
dependencies
good first issue
hacktoberfest
help wanted
improvement
needs: repro
new feature
priority: blocker
priority: high
priority: low
priority: medium
type: bug
type: bug-fix
type: discussion
type: feature request
type: improvement
type: new feature
type: refactor
type: task
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/hub!106
No description provided.