You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@toree.apache.org by Corey Stubbs <ca...@gmail.com> on 2016/01/14 20:38:36 UTC
Merge and PR Documentation
We should setup documentation for the procedures for merging code into the
code base. The Apache Mahout site contains a very good resource
<https://mahout.apache.org/developers/github.html> to reference.
Kind Regards,
Corey Stubbs
Re: Merge and PR Documentation
Posted by Gino Bustelo <gi...@bustelos.com>.
Good source of info at https://git-wip-us.apache.org/
On Thu, Jan 14, 2016 at 3:14 PM, Luciano Resende <lu...@gmail.com>
wrote:
> On Thu, Jan 14, 2016 at 11:38 AM, Corey Stubbs <ca...@gmail.com> wrote:
>
> > We should setup documentation for the procedures for merging code into
> the
> > code base. The Apache Mahout site contains a very good resource
> > <https://mahout.apache.org/developers/github.html> to reference.
> >
> > Kind Regards,
> > Corey Stubbs
> >
>
> I have also done something along these lines for STC projects
>
>
> https://github.com/SparkTC/development-guidelines/blob/master/contributing-to-projects.md
>
> What i would recommend is to try to avoid "merge commits" and try to get
> things based on rebases and cherrypicks which makes your code history a
> single line and also makes every commit to have a meaningful description
> (other then merge blah, blah, blah). You can check this by always doing a
> gitk before pushing.
>
> --
> Luciano Resende
> http://people.apache.org/~lresende
> http://twitter.com/lresende1975
> http://lresende.blogspot.com/
>
Re: Merge and PR Documentation
Posted by Luciano Resende <lu...@gmail.com>.
On Thu, Jan 14, 2016 at 11:38 AM, Corey Stubbs <ca...@gmail.com> wrote:
> We should setup documentation for the procedures for merging code into the
> code base. The Apache Mahout site contains a very good resource
> <https://mahout.apache.org/developers/github.html> to reference.
>
> Kind Regards,
> Corey Stubbs
>
I have also done something along these lines for STC projects
https://github.com/SparkTC/development-guidelines/blob/master/contributing-to-projects.md
What i would recommend is to try to avoid "merge commits" and try to get
things based on rebases and cherrypicks which makes your code history a
single line and also makes every commit to have a meaningful description
(other then merge blah, blah, blah). You can check this by always doing a
gitk before pushing.
--
Luciano Resende
http://people.apache.org/~lresende
http://twitter.com/lresende1975
http://lresende.blogspot.com/