typo 002-ways-of-working.md

palladians · Nov 15, 2024 · c2d837e · c2d837e
1 parent bc4049a
commit c2d837e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/adr/002-ways-of-working.md b/docs/adr/002-ways-of-working.md
@@ -17,7 +17,7 @@ We agree to use these ways of working.
 
 #### Merge commits
 
-The merging process in all modern software projects can turn into a never-ending debate over whether to use merge commits, sqush, or rebase strategies. Our approach is to use the strategy that requires the least care before merging into main, which is the merge commit. Yes, the git blame and logs can get messy, but from our point of view it generates the least friction and potential rebasing problems.
+The merging process in all modern software projects can turn into a never-ending debate over whether to use merge commits, squash, or rebase strategies. Our approach is to use the strategy that requires the least care before merging into main, which is the merge commit. Yes, the git blame and logs can get messy, but from our point of view it generates the least friction and potential rebasing problems.
 
 #### Code delivery stages