diff options
| author | soryu <soryu@soryu.co> | 2026-02-17 19:40:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-17 19:40:53 +0000 |
| commit | 720ebdac2f64ce18e1de68d070cd3fe46f44547c (patch) | |
| tree | 58b0be6c0c137e23730dde5434469ef33a2a0525 /makima/src/orchestration | |
| parent | 482bed06b470a12347461ee2254ea1ad41f36aaf (diff) | |
| download | soryu-720ebdac2f64ce18e1de68d070cd3fe46f44547c.tar.gz soryu-720ebdac2f64ce18e1de68d070cd3fe46f44547c.zip | |
feat: soryu-co/soryu - makima: Fix PR creation to update base branch and prevent merge conflicts (#71)
Diffstat (limited to 'makima/src/orchestration')
| -rw-r--r-- | makima/src/orchestration/directive.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makima/src/orchestration/directive.rs b/makima/src/orchestration/directive.rs index 21053f3..a6bb85b 100644 --- a/makima/src/orchestration/directive.rs +++ b/makima/src/orchestration/directive.rs @@ -1414,6 +1414,7 @@ Run these commands: git fetch origin git checkout {directive_branch} git pull origin {directive_branch} +git merge origin/{base_branch} --no-edit {merge_commands} git push origin {directive_branch} ``` |