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

i new git , wondered how should go merge in local repo have deleted several files on master branch these files exist within remote master branch.

after doing git-merge shows conflicts have occured.

using git gui shows local file deleted, while remote branch file has contents.

how stop these files being conflicted? there simple way using git gui?

many thanks

you should resolve conflicts see fit. if file supposed removed, , publishing change origin, remove again:

git rm path/to/file 

if file should in fact tracked still, add (the version in work tree version origin):

git add path/to/file 

after doing either of resolve conflict, commit merge.