<p>The version of git included with ExpressLRS Configurator (<code>/Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git</code>) is older and was incompatible with a configuration I had in <code>~/.gitconfig</code>.</p>
<p>I discovered this by running <code>git checkout</code> with its git instead of my system git.</p>
<pre><code>❯ cd '/Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS'

❯ '/Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git' checkout 3.4.2
fatal: unknown style 'zdiff3' given for 'merge.conflictstyle'
</code></pre>
<p>Sure enough, I'm using a newer conflictstyle configuration that was not supported in the bundled version of git.</p>
<pre><code>❯ grep -B1 zdiff3 ~/.gitconfig
[merge]
  conflictstyle = zdiff3
</code></pre>
<p>After commenting this out, the git checkout could succeed, and I was able to proceed with flashing.</p>

CC BY-SA 4.0
2024-09-24T18:38:21.220Z
2024-09-24T18:38:21.220Z
Edward Anderson
<p>In the ExpressLRS Configurator, I attempted to flash firmware, but it gave a generic error, as pictured:</p>
<p><a href="https://i.sstatic.net/5ZfdabHO.png" rel="nofollow noreferrer"><img src="https://i.sstatic.net/5ZfdabHO.png" alt="Error: An error has occured, see the above log for the exact error message." /></a></p>
<p>There were no logs shown, but after hitting BACK and visiting the Logs tab, I found this:</p>
<p><a href="https://i.sstatic.net/4kFJb1Lj.png" rel="nofollow noreferrer"><img src="https://i.sstatic.net/4kFJb1Lj.png" alt="[ERROR] generic error err: task: commands: 0: checkout 1: 3.4.2 format: utf-8 [INFO] check out tag directory: /Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS repository: https://github.com/ExpressLRS/ExpressLRS
srcFolder :src
tagName: 3.4.2 [INFO] git path gitPath: /Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git" /></a></p>
<p>If I change to that directory (<code>cd /Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS</code>) and run <code>git checkout 3.4.2</code>, it succeeds.</p>

<expresslrs>
ExpressLRS Configurator fails to flash due to a generic error related to checkout
Edward Anderson
# ExpressLRS Configurator fails to flash due to a generic error related to checkout

(Asked by: username_0 on 2024-09-24)

In the ExpressLRS Configurator, I attempted to flash firmware, but it gave a generic error, as pictured:

[![Error: An error has occured, see the above log for the exact error message.](https://i.sstatic.net/5ZfdabHO.png)](https://i.sstatic.net/5ZfdabHO.png)

There were no logs shown, but after hitting BACK and visiting the Logs tab, I found this:

[![[ERROR] generic error err: task: commands: 0: checkout 1: 3.4.2 format: utf-8 [INFO] check out tag directory: /Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS repository: https://github.com/ExpressLRS/ExpressLRS
srcFolder :src
tagName: 3.4.2 [INFO] git path gitPath: /Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git](https://i.sstatic.net/4kFJb1Lj.png)](https://i.sstatic.net/4kFJb1Lj.png)

If I change to that directory (`cd /Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS`) and run `git checkout 3.4.2`, it succeeds.

**Tags:** expresslrs


---

## 1 answers

### Answer by username_0 on 2024-09-24. Score: 1

The version of git included with ExpressLRS Configurator (/Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git) is older and was incompatible with a configuration I had in ~/.gitconfig.
I discovered this by running git checkout with its git instead of my system git.
❯ cd '/Users/nilbus/Library/Application Support/ExpressLRS Configurator/firmwares/binary/ExpressLRS'

❯ '/Applications/ExpressLRS Configurator.app/Contents/dependencies/darwin_amd64/git-2.29.2/bin/git' checkout 3.4.2
fatal: unknown style 'zdiff3' given for 'merge.conflictstyle'

Sure enough, I'm using a newer conflictstyle configuration that was not supported in the bundled version of git.
❯ grep -B1 zdiff3 ~/.gitconfig
[merge]
  conflictstyle = zdiff3

After commenting this out, the git checkout could succeed, and I was able to proceed with flashing.


---

