I'm working in a team and we do the merge almost every day. It's always painfull to spend hours doing che merge of the project file manually, because all the references always change and with multiple targets i's a mess. There is a better way to do it?
