The following files are conflicted (.mpk)

0
Hi everyone,    I've been getting this message whenever I try to commit today. In the past days I didn't have any conflict.   I read a lot of older posts with similar situations but I cannot make it work with the solutions given. And I think the main problem is that the conflicted file is an mpk. When using the tortoise merge, double clicking the error, I get this: I tried deleting the module from my app directory but whenever I open the app it appears again, and important to mention, this module does not appear in the marketplace modules and when I try to download it again, it says that it was successfully imported but it doesn't appear in the marketplace modules.   Do anyone knows what could be happening or how to solve this?   Thanks in advanced.
asked
3 answers
0

Sorry, I don't know why the images didn't attach. 

 

image (3).png

 

image (4).png

answered
0

See if this helps:

  • Install Tortoise on your laptop.
  • Go to fileexplorer to the main directory of your application
  • Right-click on <yourMendixAppsdirectory>\<yourMendixAppName>
  • Choose 'Tortoise Git' -> 'Resolve'

 

answered
0

Hi, for anyone that could be in the same situation, I couldn't make it work with Tortoise and any other path that was mentioned in questions similar to this one. 

 

What I did for solving this: I asked a peer if she could open the app to see the app directory, even tho she had the module she was able to commit without problems so she deleted the module from the directory and did a commit. From my side, I exported my modules individually, deleted the app directory created in my documents and then open again the app from the explorer to create a new app directory. I imported the modules, configured them again but this way I was able to commit. 

 

Maybe it's not the best practice/way but it was the only thing that worked for me. 

answered