You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/content/post/2025-06-11-version-6-6-6.mdx
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -34,7 +34,7 @@ Having so many changes in the codebase in parallel makes it hard to keep track o
34
34
To make it easier on our reviewers, we use [stacked pull requests](https://www.stacking.dev/). The idea being that each pull request builds on top of a previous one.
35
35
This way the changes are smaller and thus easier to review.
36
36
37
-
The first drawback of this approach is that if you use the stragegy squash-and-merge, you are facing some issues.
37
+
The first drawback of this approach is that if you use the strategy squash-and-merge, you are facing some issues.
38
38
39
39
- While the CI guarantees that if you merge from bottom to top into the main branch, you will not have any issues.
40
40
It quickly goes sideway as conflicts between commits are bound to happen and need to be resolved.
0 commit comments