question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

When I merge code there are conflicts but no exception or error

See original GitHub issue

This is my code

try {
        const result = await simpleGit.mergeFromTo('testGit1','categoryParams')
        console.info(result);
    } catch (error) {
        console.error(error);
    }

MergeSummaryDetail.result is “success”

Issue Analytics

  • State:closed
  • Created 3 years ago
  • Comments:8 (3 by maintainers)

github_iconTop GitHub Comments

1reaction
versolecommented, Nov 27, 2020

You are right, I changed my git language to English and it was ok. thanks

0reactions
steveukxcommented, Nov 27, 2020

Thank you for the additional detail. I’m sorry to say that as simple-git relies on the underlying git binary to respond in an english language locale, the parsers are unlikely to work for you at present. I will add this detail to the troubleshooting guide now.

Read more comments on GitHub >

github_iconTop Results From Across the Web

Merge conflict error, when there was no change in mentioned ...
The messages says you have a add/add conflict, meaning that the file was added both in your branch and in the one you're...
Read more >
Resolving a merge conflict using the command line
Merge conflicts occur when competing changes are made to the same line of a file, or when one person edits a file and...
Read more >
Merge Conflicts… WTH?!. Explain Git Branch Merges ...
In this merge logic, Git finds C2 as the common ancestor and the merge base, applies both two diffs (C2-C5 & C2-C6). Assuming...
Read more >
Resolve Git merge conflicts - Azure Repos | Microsoft Learn
Learn how to resolve merge conflicts stemming from a Git merge or a Git rebase, by using Visual Studio or the command line....
Read more >
Manage Branches and Resolve Conflicts in Git - Cloudways
If you do not merge the branch before deletion, An exception will be thrown: error: The branch 'crazy-experiment' is not fully merged. If...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found