Fix merge strategy option typo in readme

aormsby / Fork-Sync-With-Upstream-action

An action to automatically update your fork with new commits from the upstream repo

MIT License

258 stars 70 forks source link

Closed SDS1337 closed 3 years ago

SDS1337 commented 3 years ago

git_pull_args: '-s recursive -Xtheirs' (or xOurs)

After

git_pull_args: '-s recursive -Xtheirs' (or -XOurs)

Noticed this after my run failed because I used -x instead of -X.

aormsby commented 3 years ago

Thank you, I think will merge this fix into a small v2 patch shortly.