Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge conflicts display error of command not found #22

Open
ch1ll0ut1 opened this issue Mar 27, 2024 · 0 comments
Open

Merge conflicts display error of command not found #22

ch1ll0ut1 opened this issue Mar 27, 2024 · 0 comments

Comments

@ch1ll0ut1
Copy link

When using the merge driver, i get the following error:

> git merge temp   
$(npm bin)/git-json-merge .merge_file_tpeMkq .merge_file_XDZbj1 .merge_file_gwQud5: Unknown: command not found
Auto-merging document.json
CONFLICT (content): Merge conflict in document.json
Automatic merge failed; fix conflicts and then commit the result.

The merge has changes in two different lines, so without this merge driver, there actually is no merge conflict. (the default git resolves it automatically).

I have tried to install the driver globally as well and it didnt make a difference.

File: .gitattributes

*.json merge=json

File: .gitconfig


[core]
    attributesfile = ~/.gitattributes
[merge "json"]
    name = custom merge driver for json files
    driver = git-json-merge %A %O %B
        
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant