Select Items to Merge Window
Changes to the original project are highlighted in yellow.
New content is highlighted in green.
Items highlighted in red indicate that there is a conflict where two different items have the same name. If the project is merged with this item selected, one of the conflicts is renamed in the new project.
Hover over each highlighted item for a brief overview.
Click on the Information button for more details of the change.
From this window, you can merge local changes from a previous version.