From 0fccddf4d2ad6dec58a18d93013fd537822419a7 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Wed, 27 Mar 2019 15:16:05 -0700 Subject: [PATCH] Add maintainer information to CONTRIBUTING (#3331) * Add maintainer information to CONTRIBUTING * Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6fcf3a85..ecf798dd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -95,3 +95,11 @@ time you run `make build`, you can symlink the built binary into the directory: ln -s $GOPATH/bin/terraform-provider-google ~/.terraform.d/plugins/terraform-provider-google ln -s $GOPATH/bin/terraform-provider-google-beta ~/.terraform.d/plugins/terraform-provider-google-beta ``` + +# Maintainer-specific information + +## Reviewing / Merging Code + +When reviewing/merging code, roughly follow the guidelines set in the +[Maintainer's Etiquette](https://github.com/hashicorp/terraform/blob/master/docs/maintainer-etiquette.md) +guide. One caveat is that they're fairly old and apply primarily to HashiCorp employees, but the general guidance about merging / changelogs is still relevant.