"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "doc/source/core_developer.md" between
scikit-image-0.18.1.tar.gz and scikit-image-0.18.3.tar.gz

About: scikit-image is a collection of algorithms for image processing in Python.

core_developer.md  (scikit-image-0.18.1):core_developer.md  (scikit-image-0.18.3)
skipping to change at line 23 skipping to change at line 23
{doc}`mission, vision, and values <values>`. When in {doc}`mission, vision, and values <values>`. When in
doubt, always refer back here. doubt, always refer back here.
As a core team member, you gain the responsibility of shepherding As a core team member, you gain the responsibility of shepherding
other contributors through the review process; here are some other contributors through the review process; here are some
guidelines. guidelines.
All Contributors Are Treated The Same All Contributors Are Treated The Same
------------------------------------- -------------------------------------
You now have the ability to push changes directly to the master You now have the ability to push changes directly to the main
branch, but should never do so; instead, continue making pull requests branch, but should never do so; instead, continue making pull requests
as before and in accordance with the as before and in accordance with the
{doc}`general contributor guide <contribute>`. {doc}`general contributor guide <contribute>`.
As a core contributor, you gain the ability to merge or approve As a core contributor, you gain the ability to merge or approve
other contributors' pull requests. Much like nuclear launch keys, it other contributors' pull requests. Much like nuclear launch keys, it
is a shared power: you must merge *only after* another core has is a shared power: you must merge *only after* another core has
approved the pull request, *and* after you yourself have carefully approved the pull request, *and* after you yourself have carefully
reviewed it. (See {ref}`sec:reviewing` and especially reviewed it. (See {ref}`sec:reviewing` and especially
{ref}`sec:understand` below.) To ensure a clean git history, {ref}`sec:understand` below.) To ensure a clean git history,
skipping to change at line 98 skipping to change at line 98
make the changes by [pushing to their branch][gh_push] make the changes by [pushing to their branch][gh_push]
or using GitHub’s [suggestion][gh_suggest] [feature][gh_feedback]. or using GitHub’s [suggestion][gh_suggest] [feature][gh_feedback].
(The latter is preferred because it gives the contributor a choice in (The latter is preferred because it gives the contributor a choice in
whether to accept the changes.) whether to accept the changes.)
[gh_push]: https://help.github.com/en/github/collaborating-with-issues-and-pull- requests/committing-changes-to-a-pull-request-branch-created-from-a-fork [gh_push]: https://help.github.com/en/github/collaborating-with-issues-and-pull- requests/committing-changes-to-a-pull-request-branch-created-from-a-fork
[gh_suggest]: https://help.github.com/en/github/collaborating-with-issues-and-pu ll-requests/commenting-on-a-pull-request [gh_suggest]: https://help.github.com/en/github/collaborating-with-issues-and-pu ll-requests/commenting-on-a-pull-request
[gh_feedback]: https://help.github.com/en/github/collaborating-with-issues-and-p ull-requests/incorporating-feedback-in-your-pull-request [gh_feedback]: https://help.github.com/en/github/collaborating-with-issues-and-p ull-requests/incorporating-feedback-in-your-pull-request
Our default merge policy is to squash all PR commits into a single Our default merge policy is to squash all PR commits into a single
commit. Users who wish to bring the latest changes from ``master`` commit. Users who wish to bring the latest changes from ``main``
into their branch should be advised to merge, not to rebase. Even into their branch should be advised to merge, not to rebase. Even
when merge conflicts arise, don’t ask for a rebase unless you know when merge conflicts arise, don’t ask for a rebase unless you know
that a contributor is experienced with git. Instead, rebase the branch that a contributor is experienced with git. Instead, rebase the branch
yourself, force-push to their branch, and advise the contributor on yourself, force-push to their branch, and advise the contributor on
how to force-pull. If the contributor is no longer active, you may how to force-pull. If the contributor is no longer active, you may
take over their branch by submitting a new pull request and closing take over their branch by submitting a new pull request and closing
the original. In doing so, ensure you communicate that you are not the original. In doing so, ensure you communicate that you are not
throwing the contributor's work away! throwing the contributor's work away!
Please add a note to a pull request after you push new changes; GitHub Please add a note to a pull request after you push new changes; GitHub
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)