Skip to content

Commit 0a63e1a

Browse files
committed
docs: correct command ouptup
1 parent 6b72159 commit 0a63e1a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,9 @@ Say you merge 10 pull requests, 3 of which couldn't be merged due to merge confl
215215

216216
```
217217
✗ Could not merge branch 11164/command-expansion into the current branch for pull request #11164 Command expansion v2 since the merge is non-trivial.
218-
You will need to merge it yourself. Skipping this PR. Error message from git:
219-
Unresolved conflict in helix-term/src/commands/typed.rs
218+
You will need to merge it yourself:
219+
git merge --squash 11164/command-expansion
220+
Note: To learn how to merge only once and re-use for subsequent invocations of patchy, see Merge conflicts (github)
220221
```
221222

222223
<details>

0 commit comments

Comments
 (0)