Git Local Warehouse Associated with remote Warehouse

there is a local project. Before, I used SVN, to cut to Git, and now one of them uploads the latest code. How can other people connect seamlessly and not lose their own changes? what do you do?

Git
Apr.11,2021

  1. everyone put the latest code on git clone to local,
  2. then everyone overwrites the svn version of the local file directly over the pulled git folder.
  3. use software such as git diff or sourceTree to compare the changes in the contents of the files, manually confirm whether they are correct, and then git add , git commit , git push to the remote git library.
  4. individual push to the remote process will prompt a conflict. Use git pull to pull the latest version of the server to resolve the post-conflict 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-1eb1dd1-238d.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-1eb1dd1-238d.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?