If your local changes would be overwritted by a merge this is how you handle it.

• Stash Your Changes, This moves your edits into a tempoary storage area. git stash
• Pull the update. git pull
• pop the stash, this reapplies yoru chnages on to of the new code. git stash pop

If you dont care about your local changes
Git reset — hard origin/main

Commit the local change
git add deploy.sh
git commit -m “local updates to deply”

Pull the rest. git pull