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

No MergeSummary if a binary file has a conflict #838

Open
taras-dubyk opened this issue Aug 3, 2022 · 0 comments
Open

No MergeSummary if a binary file has a conflict #838

taras-dubyk opened this issue Aug 3, 2022 · 0 comments

Comments

@taras-dubyk
Copy link

Merge works fine in case of conflicts between text files. It throws MergeSummary with parsed conflicts.
But when there is a conflict between binary files, merge throws an error without MergeSummary.

I suppose it should work the same for both cases, as the git response is pretty the same and just includes one additional line in case of binary file conflict: warning: Cannot merge binary files: 1.png (HEAD vs. myBranch)

simpleGit.merge(['myBranch']);
Stack trace:

'Error: Auto-merging 1.png
CONFLICT (content): Merge conflict in 1.png
Automatic merge failed; fix conflicts and then commit the result.
warning: Cannot merge binary files: 1.png (HEAD vs. myBranch)

at Object.action (/home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:1194:25)
at PluginStore.exec (/home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:1229:29)
at /home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:1590:43
at new Promise (<anonymous>)
at GitExecutorChain.handleTaskData (/home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:1588:16)
at GitExecutorChain.<anonymous> (/home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:1572:44)
at Generator.next (<anonymous>)
at fulfilled (/home/taras/Dev/git-test/node_modules/simple-git/dist/cjs/index.js:55:24)'
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