clarify that prs must be merged to release branch

This commit is contained in:
woodser 2023-03-25 08:43:40 -04:00
parent 46eb19906d
commit 553f6fba36

View File

@ -7,7 +7,7 @@ To receive a bounty, you agree to these conditions:
- Your changes must follow the [styling guidelines](CONTRIBUTING.md). - Your changes must follow the [styling guidelines](CONTRIBUTING.md).
- Bounties will be set and awarded in XMR at discretion of the Haveno core team. - Bounties will be set and awarded in XMR at discretion of the Haveno core team.
- The issues eligible for a bounty are labelled '💰bounty' and have the amount of the bounty specified in the title in this form: `[$200]` if in dollars or `[1 XMR]` if in Monero. - The issues eligible for a bounty are labelled '💰bounty' and have the amount of the bounty specified in the title in this form: `[$200]` if in dollars or `[1 XMR]` if in Monero.
- An issue is considered resolved when the patch(es) proposed by the contributor is/are merged in the appropriate repository according to terms of the issue. - An issue is considered resolved when the patch(es) proposed by the contributor is/are merged in the appropriate repository according to terms of the issue. Pull requests to monero-project must be merged into the release branch to be considered final.
- The first person who resolves an issue in its entirety will receive the entire amount of the bounty. - The first person who resolves an issue in its entirety will receive the entire amount of the bounty.
- If the issue is resolved collaboratively by more than one person, the reward will be distributed among the contributors at discretion of the Haveno core team. - If the issue is resolved collaboratively by more than one person, the reward will be distributed among the contributors at discretion of the Haveno core team.
- Let the Maintainers know if you intend to work on a bounty, so that the issue can be assigned to you. Being assigned to an issue doesn't make that issue resolvable only by the assignee. It's meant to avoid duplication of efforts and not to discourage collective works. - Let the Maintainers know if you intend to work on a bounty, so that the issue can be assigned to you. Being assigned to an issue doesn't make that issue resolvable only by the assignee. It's meant to avoid duplication of efforts and not to discourage collective works.
@ -15,4 +15,4 @@ To receive a bounty, you agree to these conditions:
- If a big number of bounties is claimed at the same time, the maintainers might opt for sending all the rewards on a specific day of the month instead of right after resolution. - If a big number of bounties is claimed at the same time, the maintainers might opt for sending all the rewards on a specific day of the month instead of right after resolution.
- If the bounty is in dollars, the contributor will receive the amount in Monero according to the value of XMR at the moment the issue was practically resolved, so in the moment the maintainers accept the last patch resolving the issue. - If the bounty is in dollars, the contributor will receive the amount in Monero according to the value of XMR at the moment the issue was practically resolved, so in the moment the maintainers accept the last patch resolving the issue.
We want to keep the system simple and flexible, but we will add new rules or edit existing ones if necessary. We want to keep the system simple and flexible, but we will add new rules or edit existing ones if necessary.