Hi Giovani,
Thats right, upgrade the mainline to 9.12.4 in order to merge those changes. If you are trying other way around it will work, when you try merging from 9.6 to 9.12 it will work. Once upgraded from merge options select Advanced Merge and select the versions you would like to merge to mainline from Branch line.
Hope I answered your question,
Ashok