Merge changes using vimdiff

Question

In my case, I have two files file1 and file2. Using vimdiff, I want to merge the changes as follows:

1. In first difference, place line from file1 above line from fi

Answer 1

You can switch back and forth between the two windows with Ctrlww. You can copy from one window do a Ctrlww, and then paste into the other. As you resolve differences, the highlights will change, and disappear.

Take a look at this video.