How to handle local and remote file conflicts

the local file conflicts with the remote file, but now I don"t want to merge the remote file, because there will be a lot of redundant files. What should I do?

Git
May.24,2021

if there is a conflict, just resolve the conflict.

do the extra files here refer to the extra files generated after the conflict? If so, these documents will naturally be gone for conflict resolution.

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-1e9fbcd-464ff.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-1e9fbcd-464ff.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?