Advanced Merge Option not present when using Git and 9.24

5
We recently migrated svn to git and also upgraded Mx 9.12.5 to 9.24.0. While merging code from one branch to another, earlier there used to be option of Advance merge.  With Advanced merge one can merge range of commits from feature branch into another branch where merge is taking place. but with Git Migration and Studio Pro 9.24 upgrade we do not see this option anymore.
asked
2 answers
0

Hi Rajesh Rakshe,  we have a separate Git merging experience at the moment that is always merging the entire branch. So there is no advanced merge for Git now. I think it would be good to mention it on our Ideas Forum, where you can post a feature request that can be reviewed, expanded on, and voted on by other members of the Mendix community. Thanks 

answered
0

Using cherry-pick via GitHub Desktop and the following resource might be helpful:

 

https://docs.mendix.com/refguide/mx-command-line-tool/merge/#32-conflicts

 

I'm not sure if you would be able to easily resolve conflicts outside of the modeller though, as it's the changes in the .mpr files which are compared and Mendix has their own custom algorithm to display these in the modeller.

answered