Rookie question: please ask a question about using github version to update

I used a program as a development template in github by downloading it locally.

based on this template, I made a lot of changes. (delete, add and modify)

now the original developer has made a large-scale update to the program template.

I would like to ask your experience, in my case, how to use a relatively simple method, that is, to keep my own changes, but also to use template updates?

because I am not in the IT industry, the problem is relatively primary. Thank you for your guidance.

Feb.28,2021

if the change size is within an acceptable range, use git fetch and git merge to manually get updates, and manually resolve conflicts for merging;
but if a lot of code in the original repository or a lot of code has been modified, it is recommended that you re- git clone and then modify it manually.


if it is locally controlled and Synchronize remote warehouse is not needed. You can ignore it. If you want Synchronize to go to your own library remotely, you can modify it by git remote

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