Initial commit
This commit is contained in:
5
commands/conflicts.md
Normal file
5
commands/conflicts.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
description: Fix all merge conflicts and continue the git rebase
|
||||
---
|
||||
|
||||
See [shared/conflict-resolution-instructions.md](../shared/conflict-resolution-instructions.md) for conflict resolution instructions.
|
||||
Reference in New Issue
Block a user