Git reports to dirty worktree when merging another branch code, how to find out where there is a conflict between the two different branch codes?

such as the title, report to dirty worktree, but how do you think there is a conflict?

Git
Jun.12,2022

git status can tell us the conflicting files look at teacher Liao Xuefeng's article

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