Hi,I have a feature branch and I want to merge mainline to it. I know for sure there are a lot of functional changes this merge should bring. However, I get only a handful of changes and all of them are widgets and themesource and no actual functional changes that I'm expecting. It also says there's a conflict but there is no conflict shown in the Changes pane. Tried it several times already, same result. And this is not the first branch I'm having these issues with since moving to Mx11. Does anyone know how to fix this or if there's any workaround?Thanks !
asked
Cojocaru Razvan
1 answers
0
Hi,
You can actually see conflicts in changes tab. If not synchronise the app and try checking also if you could mention exactly which 11 version are you using would help!