Resolve Git Conflict

 Reference:
https://akshayranganath.github.io/Git-Pull-Handling-Merge-Conflict/

Restore Deleted file/folder

For folder:

export file=my_apache_conf.d

For Individule file:

export file=my_apache_conf.d/conf.d/rules-custom.conf

echo $file

git checkout $(git rev-list -n 1 HEAD -- "$file")^ -- "$file"