What is the best way to resolve a conflict like both added in git?

Question

git

After merging the master into its branch, git status outputs:

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both added:         web/img_new

web/img_new is a symlink to a folder in /img_new/
I created this folder in my branch, just as another developer created the same folder.
You need to save the contents of the folders in both branches.
Thanks in advance.

Answer 1

Rename the directory in one of the branches, merge without conflicts, manually merge two directories into one, commit.