We have a framemaker project with several books and we use Git to store the .fm files. We have a situation where version 1 is already released and I have started working on version 2 and made a bunch of changes. version 2 is not yet ready to be released though. In this state, the clients have asked for a bunch of changes to version 1. I have a copy of version 1 and so I can make those changes. However, without having to manually redo those in version 2, is it possible to merge the 2 versions? Since framemaker files are binary files, I guess I cannot.. Is that right?