I am trying to merge a sub branch which has conflicts into my main branch, but in the Solving Conflicts windows in Studio I get text that the program seems to not be able to translate. As I try to select the changes I want saved to the main branch they do not get selected, as in the final window there are no changes to be selected no matter what I have selected previously, so I cannot have the branch merged.
Any help is appreciated, thanks in advance!