squash and merge, meter group psa

website/docs/adding_meters_buildings.md

@@ -20,6 +20,8 @@ The following tables in the SQL database should be updated each time a new meter
   - Should update itself for new meters; the primary key `id` will auto-increment so you can tell new meters were added
 - `meter_groups`
   - Make sure to update the `building_id_2` value in `meter_groups` table if you are adding a new building
+  - Each meter group is essentially defining a separate graph. If you have multiple energy types (e.g. the building has both electricity and gas), then make sure to define a separate meter group for each energy type
+    - Review [this page](energy_dashboard_graphs#relevant-files) if you forget how to tell which energy type is which
 - `buildings`
   - Update building image by uploading image to `osu-energy-images` AWS S3 bucket (manual upload will be simplest)
   - Get map ID from https://www.openstreetmap.org/ ("way" on openstreetmap = map ID in database)

website/docs/git.md

@@ -104,6 +104,7 @@ Feel free to edit this doc / instructions as needed, this is a living document.
 - Please remove any debug comments (`console.log`) statements you added at this point and rename variables if any are confusingly named
 - Run `npm run format` if you haven't already, make sure you ran it in the last commit for the PR
 - Merge PR once you have reviewed the checklist items above, and have also conducted a general code review on any changed files, and made any last changes you would like to make
+  - Pick the "Squash and Merge" option when merging the PR, to prevent bloat in the main / master branch's commit history. You can see the individual commits on the PR anyways
   <!---
   move the below bullet point to another dedicated frontend testing / devops doc maybe? idk. frontend prereqs doesn't feel like a good fit
   -->