For deleting the remote branch: git push origin --delete <your_branch> Override current file with server file git checkout --theirs package-lock.json