Skip to content

Commit 0e507bb

Browse files
authored
Update introduction.md
1 parent b95a522 commit 0e507bb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

episodes/introduction.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ A disadvantage is that it rewrites commit history, which can be problematic for
138138

139139
::: callout
140140

141-
Note that you are rebasing onto the feature branch and merging into the main branch.
141+
### Rebase and merge location
142+
143+
Note that you are rebasing into the feature branch and merging into the main branch.
144+
142145
:::
143146

144147
Here is a little comparison of the three merge strategies we have covered so far.

0 commit comments

Comments
 (0)