Hi @virtualcitymatt !
A timely question indeed—We are currently working on a visual workspace comparison (diff) tool for FME Desktop, that will also allow the ability to merge changes. I can't promise anything for 2022.0, but we are striving for that goal! The reason I mention this: While this feature won't likely address your pain point above, the idea is that the underlying "guts" of this visual diff tool will pave the way for us to have proper git integration later on. For this reason, we are not likely to change the way .fmws are compiled, BUT we will, over the next few releases, be working towards a much more robust solution for versioning and managing workspaces.
I hope this helps! In the meantime, if you have any other questions feel free to reach out 
.
Hi @virtualcitymatt !
A timely question indeed—We are currently working on a visual workspace comparison (diff) tool for FME Desktop, that will also allow the ability to merge changes. I can't promise anything for 2022.0, but we are striving for that goal! The reason I mention this: While this feature won't likely address your pain point above, the idea is that the underlying "guts" of this visual diff tool will pave the way for us to have proper git integration later on. For this reason, we are not likely to change the way .fmws are compiled, BUT we will, over the next few releases, be working towards a much more robust solution for versioning and managing workspaces.
I hope this helps! In the meantime, if you have any other questions feel free to reach out .
Oh this is awesome news, this is perfect for the review process. You're right in that will still be difficult/impossible to merge changes, however, perhaps this will allow a workflow that is more git friendly. Thanks @annabelleatsafe !!
