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:

How to reproduce (4.5 KB)

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

Fixed in wappler 3.7.3

This topic was automatically closed after 3 days. New replies are no longer allowed.