On Thu, Jan 14, 2016 at 11:38 AM, Corey Stubbs <[email protected]> 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/
