Yes the GXL files are just XML and so you can source control them and generally normal merges work without problems. If you have really major changes to a visual studio project/solution and then try ...
I am currently trialing out Globalizer and loving the potential, but a big deal breaker for me is the fact that it seems to create a resource file for each individual control in WPF.