Merge tool

Left window code from server

Right window code from local

Bottom green is merged code.

take left - takes server version

take right- takes local version

accept  merge. will accept the change.

next conflict and repeat the same.

Visual Studio Settings that needs to be done before starting development

 

To make newly created elements appear in same like AOT

To have multiple tabs.