How to clear the merge information prompted by the system from the remote warehouse git merge?

recently, I want to use the company"s remote warehouse in my work, so I fork myself remotely and locally.
when I asked for a merge when I submitted the code today, I found that the public warehouse had been updated and conflicted before I submitted it. Pull came down to remind me of enter a reason to explain this merge is necessary.. The main idea is to explain why the merger. After I filled it out, I found a commit message (see attached picture)
clipboard.png
pushed up and found one more commit message remotely. Can this information be removed? Or merge into this commit?

Git
Mar.06,2021

this is when someone submitted a message when you pushed it up, so there is a conflict in some places, and then when you pull it down, you will pull down the message you just submitted, so it will prompt


you can first pull-- rebase and then push without this message.

means to pull the newly added remote commit locally, and then resubmit the newly added local commit. There will be no problem with push.

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