[Resolve merge conflicts in dist/ directory] Ignore incoming merge conflicts for dist/ files and just use "ours"

force_resolve_dist_conflicts.sh

# Pull in changes
# NOTE: This is what will cause the merge conflicts
git pull --rebase origin develop

# Force resolve dist/ conflicts by using "ours"
git checkout --ours dist
git add dist
git rebase --continue

# Regenerate dist/ files
bin/generate-dist-files.sh