long-support-update actions

支持网站的“后台”确实该更新了

比较重要的是package.json文件，误删了还得用git reset --hard [commit_id]回退。

其中，node_moudules中和package.json版本无法对应，导致报错可以用ncu解决；

npm install npm_check_updates -g


**``package.json``和``package-lock.json``区别就在于，后者是前者的补充或者说是具体描述，并且文件字段也略有不同（懒得赘述，抱歉）**

git rebase和git merge

我在处理长期更新问题时，在GitHub Action中对workflow文件作出了修改。
以及我在本地仓库对package.json和package-lock.json文件做出了修改
然后本地推送到远程仓库时：

 * branch              main       -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.


好吧它分叉了，然后我从🐂×的StackOverflow上面找到了答案。
仅仅两个图，非常易懂：

git rebase

    ... o ---- o ---- A ---- B  origin/main (upstream work)
                      \
                       C'  main (your work)

git merge

    ... o ---- o ---- A ---- B  origin/main (upstream work)
               \      \
                C ---- M  main (your work) 


确实厉害~

它在这儿: https://stackoverflow.com/a/2452610