Unverified Commit ce15a1d7 authored by Matthias Urhahn's avatar Matthias Urhahn Committed by GitHub
Browse files

Merge pull request #1387 from corona-warn-app/fix/master-into-1.4.x

Master into 1.4.x (DEV)
parents b69c4326 3b202b68
......@@ -28,7 +28,7 @@ Only start working on the Pull Request after the team assigned the issue to you
If you have questions about one of the issues, please comment on them, and one of the maintainers will clarify.
We kindly ask you to follow the [Pull Request Checklist](#Pull-Request-Checklist) to ensure reviews can happen accordingly.
We kindly ask you to follow the [Pull Request Checklist](https://github.com/corona-warn-app/cwa-app-android/blob/master/.github/pull_request_template.md) to ensure reviews can happen accordingly.
## Contributing Code
......@@ -48,26 +48,6 @@ The following rule governs documentation contributions:
* Contributions must be licensed under the same license as code, the [Apache 2.0 License](LICENSE)
## Pull Request Checklist
* Branch from the dev branch and ensure it is up to date with the current dev branch before submitting your pull request. If it doesn't merge cleanly with dev, you may be asked to resolve the conflicts. Pull requests to master will be closed.
* Commits should be as small as possible while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
* Pull requests must not contain compiled sources (already set by the default .gitignore) or binary files
* Test your changes as thoroughly as possible before you commit them. Preferably, automate your test by unit/integration tests. If tested manually, provide information about the test scope in the PR description (e.g. “Test passed: Upgrade version from 0.42 to 0.42.23.”).
* Create _Work In Progress [WIP]_ pull requests only if you need clarification or an explicit review before you can continue your work item.
* If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment, or you can ask for a review by contacting us via [email](mailto:corona-warn-app.opensource@sap.com).
* Post review:
* If a review requires you to change your commit(s), please test the changes again.
* Amend the affected commit(s) and force push onto your branch.
* Set respective comments in your GitHub review to resolved.
* Create a general PR comment to notify the reviewers that your amendments are ready for another round of review.
## Issues and Planning
* We use GitHub issues to track bugs and enhancement requests.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment