Hello everyone,


As I think we never stated clearly what the contribution process should be,
and as it crystalized to me in the recent month, I would like to take the
chance and propose the following process:



*Branching/Forking Strategy*



1.      The most convenient way for that is to for one of the
*incubator-milagro* repositories from GitHub, i.e. from
https://github.com/apache/incubator-milagro-*****.git.

2.      A branch for the specific work should then be created in the forked
repository



*Submitting Changes for Review*



1.      After the changes have been complete, meeting all the code quality
requirements of the project (still TBD), a Pull Request should be done in
GitHub to merge the branch with the changes from the forked repo to the
*master* of the *incubator-milagro* GitHub repo.

2.      The Pull Request will be discussed over GitHub and if necessary it
will be updated during the review process.



*Merging the Changes*



As the GitHub repos are just one-way mirroring at the moment the repos in
git://git.apache.org <git://git.apache.org/incubator-milagro-crypto.git> (
https://git1-us-west.apache.org/repos/asf), the changes cannot be merged
over GitHub. For this reason the following steps need to be taken to merge
the contribution:

1.      Clone locally the respective repository from
https://git1-us-west.apache.org/repos/asf. For instance, if the
contribution is in https://github.com/apache/incubator-milagro-crypto.git,
the repo
https://git1-us-west.apache.org/repos/asf/incubator-milagro-crypto.git
should be cloned.

2.      Add the repository from which the code should be merged (let’s call
it contribution repo) as an additional remote in the local repo that was
just cloned.

3.      Merge the branch from the contribution repo to the master of the
Apache repo. If the contrition code is based properly, this merge should be
trivial one.

4.      Commit and push the changes to the Apache repo origin. Note that
this step requires authentication, for which purpose the merging developer
should have an Apache ID with proper permissions.



Please comment on the above. I would like to raise it for voting in a short
while.



Best Regards,



*Simeon Aladjem*

*MIRACL*

Reply via email to