mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Slack Coder 2023-05-13 17:32:12 -05:00 committed by Alexis Sellier
parent 5ccd74aa8a
commit ad48514ddd
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-cli/examples/workflow/6-pulling-contributor.md
View File

@ -18,7 +18,7 @@ Now let's checkout `master` and pull the maintainer's changes:
``` ```
$ git checkout master $ git checkout master
Your branch is up to date with 'rad/master'. Your branch is up to date with 'rad/master'.
$ git pull --all $ git pull --all --ff
Fetching rad Fetching rad
Fetching z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi Fetching z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
Updating f2de534..f6484e0 Updating f2de534..f6484e0