git - merge conflict when local is deleted but file exists in remote

Question

I am very new to git and wondered how I should go about a merge where in the local repo I have deleted several files on the master branch but these files exist within the re

Answer 1

In EGit I also found problems. My solution was:

• Used the Git Staging view.
• Double clicked on each files shown on unstaged changes to open comparator
• Click on the "Copy all from left to right" icon
• Save file (it will disappear from the unstaged list)