adding template description for merge requests

AdminXVII authored 5 years ago and Michael Aaron Murphy committed 5 years ago

- Adds a merge request guidelines section
- Switch to squashed, conventional-style commits for MRs
- Specify preference for rebase over merges
- Link to a resource explaining a recommended git flow