How to merge origin master folders?

github already has project1 project2. on it

I modified project2 on this machine (project1 project2 was not pushed locally at the time).

how to replace project2? in github repo with project2 on local computer

this will happen if you push project2 to github, directly from the local machine.

github already has project1 project2 on it. There will be only one folder project2.

what should I do?

Mar.21,2021
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-1e44f05-44af3.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-1e44f05-44af3.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?