git pull --rebase

git pull origin <branch> --rebase

git config --global pull.rebase true

if fitpull origin not working

rm /home3/codentin/SMS/.git/index.lock