rootpy/rootpy — pull request #65 by ndawe (2012-11-16 21:36:32+00:00)
Title: Notes on git best practices: merging and rebasing (+ a few minor edits)

Quite a few people are resyncing their work by merging in rootpy/master:

https://github.com/rootpy/rootpy/network

Which is fine to do privately, but not ideal, since it risks creating criss-cross merges which means you can actually lose code if you're not careful.

This PR adds a section in CONTRIBUTING.rst about merging and rebasing.