we work with Mendix 9.24.22 and git version control. I have created a branch from the mainline on which I made several commits. Some days later I created a new branch from mainline and wanted to merge the changes from my former branch to the new branch. Git suggests two type of merges.1: feature branch2: Port fix For some reason the feature branch merge does not work for me. I have to merge all the changes seperately by portfix merge. When I ask my collegue to merge with the feature branch option, all changes are merged at once.It is not an incident as have experienced this issue already for more than a year. I wonder why this feature branch merge does not work for me.I already looked for some settings that might influenced this situation, but I can't find anything. Have others encountered the same issue? Is there a solution for this issue.
asked
Rolf Voormolen
2 answers
2
Rather than 'you' I suspect it is 'your laptop'. Where you have a different, older gradle or a different, older git .exe installed. Compare those versions with your collegue and see if re-installing or upgrading those will make a difference.