From 527c8a510d5314c38a2ed4b0da9fafd7b6bddc6b Mon Sep 17 00:00:00 2001 From: Lawrence Chou Date: Sun, 16 Jun 2024 10:38:41 +0800 Subject: [PATCH] Replace deprecated `--preserve-merges` with `--rebase-merges` --- homu/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homu/main.py b/homu/main.py index 4722d87..71b9069 100644 --- a/homu/main.py +++ b/homu/main.py @@ -947,7 +947,7 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg, ' you can resolve the conflict following these steps:\n\n' '1. `git checkout {branch}` *(switch to your branch)*\n' '2. `git fetch upstream master` *(retrieve the latest master)*\n' - '3. `git rebase upstream/master -p` *(rebase on top of it)*\n' + '3. `git rebase upstream/master --rebase-merges` *(rebase on top of it)*\n' '4. Follow the on-screen instruction to resolve conflicts' ' (check `git status` if you got lost).\n' '5. `git push self {branch} --force-with-lease` *(update this PR)*\n\n'