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
Using cherry-pick via GitHub Desktop and the following resource might be helpful:
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.