Unknown option for merge-recursive: -X ours

nolde commented 3 years ago

Getting the following error when using "ours" strategy, using @saithodev/semantic-release-backmerge@1.5.0:

[8:00:40 AM] [semantic-release] › ✖  An error occurred while running semantic-release: Error: Command failed with exit code 128: git merge -X ours origin/master
fatal: Unknown option for merge-recursive: -X ours

Config:

          [
            '@saithodev/semantic-release-backmerge',
            {
              clearWorkspace: true,
              backmergeStrategy: 'merge',
              mergeMode: 'ours',
              plugins: [['@semantic-release/exec', { successCmd: backmergeSuccess }]]
            }
          ]

I think the correct way to use it is -Xours, without space character. A few examples where it shows up like that:

saitho commented 3 years ago

Looks like it. Wasn't really apparent from looking at the Git documentation (didn't look too closely at the examples)

saitho commented 3 years ago

:tada: This issue has been resolved in version 1.5.3 :tada:

The release is available on:

Your semantic-release bot :package::rocket:

saitho / semantic-release-backmerge

Unknown option for merge-recursive: -X ours #23