- Ensure there are no git remains
.orig.baseetc. - Try to keep the git log a straight line as possible
- where possible and sensible do a fast forward merge
- Always create feature branch or forks which can merged through a pull request
- Start by having discussion - github issues would be a good place to bounce your ideas before you invest time in writing code
- Always accompany code changes with documentation - so that code base always remains relevant to people trying to consume it.