Fatal error 128: Unable to merge changes.

0
Hi everyone,   My project group and I are working on the same Mendix application. After one of my teammates pushed their changes, I tried to pull them, but I keep getting the following error:   I also encounter the same error when I try to commit my own changes.   Has anyone experienced this before or knows how to resolve it?   Thanks in advance!  
asked
0 answers