Skip to content

Commit dbc389c

Browse files
committed
use a stronger pause
1 parent aa9bff2 commit dbc389c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/external-repos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Then, when you do a pull, the merge works without conflicts.
124124
While it's definitely possible to resolve conflicts during a pull, you may have to redo the conflict
125125
resolution if your PR doesn't get merged fast enough and there are new conflicts.
126126
Do not try to
127-
rebase the result of a `git subtree pull`, rebasing merge commits is a bad idea in general.
127+
rebase the result of a `git subtree pull`; rebasing merge commits is a bad idea in general.
128128
129129
You always need to specify the `-P` prefix to the subtree directory and the corresponding remote
130130
repository.

0 commit comments

Comments
 (0)