What criteria does Wappler use to determine there are merge conflicts that need to be resolved?
I would bet a few beers that Wappler has no criteria over that. Criteria is given by GIT so I guess you can resort to its documentation.
Yes, you’re probably correct. I won’t take that bet.
from git “Often, merge conflicts happen when people make different changes to the same line of the same file, or when one person edits a file and another person deletes the same file.”
It sounds like git will try to merge, even when there are changes on different lines in the same file, unless it runs into things it doesn’t understand.