Solution to resolve problem - Hercules-Admin/Hercules GitHub Wiki

1.To resolve conflict
git pull
git commit -a
git pull
Remove redundant in conflict file
git commit
git push
#Option 👍 git mergetool -t meld