Is there a recommended way to merge two projects? I have tried this in the past and become frustrated quickly. The mapping from the file system to the tree structure is confusing. I also have problems with include files and paths. Is there a best practice to merge code?
