Git resolve error

Wappler Version : 3.7.2
Operating System : mac
Server Model: node
Database Type: maria
Hosting Type: docker

Expected behavior

When choosing to resolve a git merge conflict, it should be resolved

Actual behavior

Error message:

Screen Shot 2021-01-22 at 2.43.01 PM926×464 18.9 KB

How to reproduce

chrome_debug.log.zip (4.5 KB)

Related…is there a way to see a list of files that triggered the merge conflict?