Git submission code conflict

I do the project by myself now, but sometimes the submission code conflicts. I ask my friend that my reset caused the error.
I wonder why reset"s own code causes the error.

Git
Sep.17,2021

reset and then commit will cause the branch tree to deviate, thus prompting you to conflict.


what's said upstairs makes sense


your reset is just your own warehouse. You should also have a remote warehouse. You should reset. the remote warehouse as well. Is git push-f

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-1b3ee6a-2b7b3.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-1b3ee6a-2b7b3.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?