Skip to content

git node backport v8 does not work on macOS #421

Closed
@dominykas

Description

@dominykas

I got an error saying Resolve merge conflicts and enter 'RESOLVED' - however there were no conflicts. The actual underlying failure was patch: unrecognized option '--merge' - it seems the patch on macOS does not have that option.

I'm happy to research/PR whatever would be considered an acceptable fix?

Also not sure if there's a good way to detect conflicts vs other kinds of errors - the error message was rather misleading.

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions