From 720ebdac2f64ce18e1de68d070cd3fe46f44547c Mon Sep 17 00:00:00 2001 From: soryu Date: Tue, 17 Feb 2026 19:40:53 +0000 Subject: feat: soryu-co/soryu - makima: Fix PR creation to update base branch and prevent merge conflicts (#71) --- makima/src/orchestration/directive.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'makima/src/orchestration') 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} ``` -- cgit v1.2.3