Such an error is the difference between a local file and an uncommitted file. So, use git status first

Then git add the differences file. Then git Commit. But here’s another problem.

Git push -f Origin master

Then switch the branch to master.

Branch development is recommended.