3-way merge Whenever a team of developers are working on a project, conflicts in shared files are bound to happen. Team Foundation Server makes sure these conflicts don’t interrupt the software development lifecycle by providing a sophisticated conflict resolution tool. The 3-way merge tool illustrated below shows your changes in the right-hand pane, their changes in the left-hand pane, and the merged results in the bottom pane. Your changes are the changes in your local workspace. Their changes are the changes currently stored in Team Foundation Server. To resolve these differences, you can pick from changes in either panel – either yours or theirs. The result is shown below. That bottom panel also allows for editing, so you can fine-tune the resolution that you make. The Conflict Resolution Tool allows teams to work in parallel and be assured that any potential conflicts are resolved easily and quickly. 3-way Merge Tool