From ad48514dddb849dcf707b6533729b0eb1ea0283b Mon Sep 17 00:00:00 2001 From: Slack Coder Date: Sat, 13 May 2023 17:32:12 -0500 Subject: [PATCH] cli: Fix workflow test 'git pull' in workflow/6-pulling-contributor causes a message to be emitted for some git versions. It asks to configure 'git pull's default action. Use '--ff' as a workaround as a git config file is unsupported, and no environment variable exists for this configuration. --- radicle-cli/examples/workflow/6-pulling-contributor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicle-cli/examples/workflow/6-pulling-contributor.md b/radicle-cli/examples/workflow/6-pulling-contributor.md index 3c653d99..bb61f3fa 100644 --- a/radicle-cli/examples/workflow/6-pulling-contributor.md +++ b/radicle-cli/examples/workflow/6-pulling-contributor.md @@ -18,7 +18,7 @@ Now let's checkout `master` and pull the maintainer's changes: ``` $ git checkout master Your branch is up to date with 'rad/master'. -$ git pull --all +$ git pull --all --ff Fetching rad Fetching z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi Updating f2de534..f6484e0