Add squash and merge to dev onboarding (ten-protocol#1288)

bravesasha · May 25, 2023 · 1a64bc0 · 1a64bc0
1 parent 4f9851f
commit 1a64bc0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/developer_onboarding_guide.md b/developer_onboarding_guide.md
@@ -22,7 +22,8 @@ gofumpt -l -w .
 golangci-lint run --verbose --fast
 ```
 
-When your branch is ready for review, another developer must approve the changes. Only then can it be merged into the `main` branch. It's recommended to delete your branch from Github after it has been merged.
+When your branch is ready for review, another developer must approve the changes. Only then can it be merged into the `main` branch. For merging, we normally use `Squash and merge` (it appears in dropdown once PR is approved).
+It's recommended to delete your branch from Github after it has been merged.
 
 ## Running End-to-End Tests