Skip to content

Commit b114ca9

Browse files
authored
Update introduction.md
1 parent d9fed6f commit b114ca9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

episodes/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Here is a little comparison of the three merge strategies we have covered so far
148148

149149
### Squash & Merge
150150

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.
152152
This strategy simplifies the commit history, making it easier to follow.
153153
This strategy is ideal for merging feature branches with numerous small commits, resulting in a cleaner main branch history.
154154

0 commit comments

Comments
 (0)