OK, that sounds fair enough. I admit that I'm not a big fan of merging and I've learned a few lessons on it. I did it all manually (i.e., not depending upon "svn merge") with kdiff3, but any descent 3 diff program should work. Also, I merged the "glest_game" with "game" and glest_map_editor" with "map_editor" separately, and then did the rest of the tree.