Skip to content

Commit

Permalink
Add merge guidance to PR tips.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrhender committed Jan 9, 2024
1 parent 74e2904 commit a548179
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ Reviewers should be added by the pull requester.
A "healthy" number of reviewers, usually at least 3 people
other than yourself, is good.

### Merging Pull Requests

It is recommended to merge PR using a "Rebase merge", rather than a "Squash and merge".
Merge commits are disabled in order maintain a linear commit history.
"Rebase and merge" is prefered because it maintains the authorship and commit date information which can be important for determining intellectual property contributions.

## Edit style guide
The following are style tips when editing the specification.
- Try to have max of 80 char (do hard wrap, not auto wrap)
Expand Down

0 comments on commit a548179

Please sign in to comment.