Git merge and editor exports