hi... i m working on Mendix Application on Team Server . one another working on this application. Through project updation i have three conflicte error show in popup message :- C:\Users\shri\Documents\Scheduling Application-main\javasource\com C:\Users\shri\Documents\Scheduling Application-main\widgets\Calendar.mpk C:\Users\shri\Documents\Scheduling Application-main\widgets\colorpicker (1).mpk How can solve this error .....
asked
NR
1 answers
0
Conflicts can allways happen and sometimes need to be resolved by hand. Go to your changes screen and decide when for instance a microflow is changed by multiple persons which person win.
You need to decide if you want to keep your changes or the changes of the other person.
Only after all the conflicts are resolved you can commit your changes again.