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: episodes/introduction.md
+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
@@ -148,7 +148,7 @@ Here is a little comparison of the three merge strategies we have covered so far
148
148
149
149
### Squash & Merge
150
150
151
-
Squash and merge command (`git merge --squash`) squashes all the commits from a feature branch into a single simple commit (and not a "3-way merge" commit) before merging into the main branch.
151
+
Squash and merge command (`git merge --squash`) squashes all the commits from a feature branch into a single regular commit (and not a "3-way merge" commit) before merging into the main branch.
152
152
This strategy simplifies the commit history, making it easier to follow.
153
153
This strategy is ideal for merging feature branches with numerous small commits, resulting in a cleaner main branch history.
0 commit comments