kopia lustrzana https://github.com/jupyterhub/repo2docker
Add guidelines on merging work.
rodzic
2dbe4c51d3
commit
e1fc79bb0c
|
@ -5,6 +5,7 @@ This document covers:
|
||||||
- Setting up for Local Development
|
- Setting up for Local Development
|
||||||
- Running Tests
|
- Running Tests
|
||||||
- Updating and Freezing BuildPack Dependencies
|
- Updating and Freezing BuildPack Dependencies
|
||||||
|
- Merging a Pull Request
|
||||||
- Creating a Release
|
- Creating a Release
|
||||||
|
|
||||||
## Setting up for Local Development
|
## Setting up for Local Development
|
||||||
|
@ -201,6 +202,23 @@ repository, with a description of what versions were bumped / what new packages
|
||||||
added and why. If you fix a bug or add new functionality consider adding a new
|
added and why. If you fix a bug or add new functionality consider adding a new
|
||||||
test to prevent the bug from coming back/the feature breaking in the future.
|
test to prevent the bug from coming back/the feature breaking in the future.
|
||||||
|
|
||||||
|
|
||||||
|
## Merging a Pull Request
|
||||||
|
|
||||||
|
There are not a lot of rules around merging a Pull Request (PR), we rely on
|
||||||
|
individuals to be responsible and tread softly when doing so. Below a few
|
||||||
|
standard procedures that have proven useful over time that we do follow:
|
||||||
|
|
||||||
|
* do not merge your own PR
|
||||||
|
* wait for travis to complete
|
||||||
|
* check if test coverage has gone up or down, consider discussing additional
|
||||||
|
tests to keep coverage at the same level or even increase it
|
||||||
|
* do use merge commits instead of merge-by-squashing/-rebasing. This makes it
|
||||||
|
easier to find all changes since the last deployment `git log --merges --pretty=format:"%h %<(10,trunc)%an %<(15)%ar %s" <deployed-revision>..`
|
||||||
|
* [when you merge do deploy to mybinder.org](http://mybinder-sre.readthedocs.io/en/latest/deployment/how.html)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Creating a Release
|
## Creating a Release
|
||||||
|
|
||||||
We try to make a release of repo2docker every few months if possible.
|
We try to make a release of repo2docker every few months if possible.
|
||||||
|
|
Ładowanie…
Reference in New Issue