master提交PR到main分支出现：There isn't anything to compare.main and master are entirely different commit histories.

解决方案

以下操作会强制覆盖原有代码，所以需要将要保留的内容提前存下来，覆盖后再手动更新上去。

git checkout master
git branch main master -f
git checkout main
git push origin main -f

为何不能合并？

在git checkout main之后会提示你执行git pull，试验发现合并失败，提示：fatal: refusing to merge unrelated histories，应该是和master不允许提交PR到main分支一个意思，没有相同的关联记录，即使代码差不多。

删除不需要的分支

删除本地master分支

git branch -D master

删除远程master分支

git push origin --delete master

如何github commit记录全部清除？

解决

1. 新建orphan分支

git checkout --orphan latest_branch

1. 将需要的文件添加到暂存区

git add -A

3. Commit

git commit -m "..."

4. 删除main分支

git branch -D main

5. 将当前latest_branch分支重命名为main分支

git branch -m main

6. 最后，推送到远程仓库

git push -f origin main

参考

• https://stackoverflow.com/questions/23344320/there-isnt-anything-to-compare-nothing-to-compare-branches-are-entirely-diffe
• https://github.com/lishuhao/blog/issues/9

问题

npm install报错:

The operation was rejected by your operating system.
npm ERR! It's possible that the file was already in use (by a text editor or antivirus),
npm ERR! or that you lack permissions to access it.
npm ERR!
npm ERR! If you believe this might be a permissions issue, please double-check the
npm ERR! permissions of the file and its containing directories, or try running
npm ERR! the command again as root/Administrator.

解决

1. 查看是否有程序占用项目文件夹,比如:
   • git bash打开了项目
   • github desktop打开了项目
   • 另外的cmd窗口打开了此文件夹/项目文件夹
   • 开启了本地服务器/vscode等编辑器软件打开了项目
2. 在项目中已管理员身份运行cmd(如何以管理员身份运行cmd)

创建一个仓库后

# Git global setup
git config --global user.name "独书先生"
git config --global user.email "1414556676@qq.com"

# Create a new repository
git clone ssh://git@github.com/DuShuSir/openSource.git
cd jystaticft
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master

# Push an existing folder
cd existing\_folder
git init
git remote add origin ssh://git@github.com/DuShuSir/openSource.git
git add .
git commit -m "Initial commit"
git push -u origin master

# Push an existing Git repository**
cd existing\_repo
git remote rename origin old-origin
git remote add origin ssh://git@github.com/DuShuSir/openSource.git
git push -u origin --all
git push -u origin --tags

删除GitHub中的所有提交历史记录

删除.git文件夹可能会导致git存储库中的问题。如果要删除所有提交历史记录，但将代码保持在当前状态，可以按照以下方式安全地执行此操作：

1. 尝试 运行 git checkout –orphan latest_branch
2. 添加所有文件 git add -A
3. 提交更改 git commit -am “commit message”
4. 删除分支 git branch -D master
5. 将当前分支重命名 git branch -m master
6. 最后，强制更新存储 git push -f origin master

设置本地多账户

git init
git add .
git commit -m "init"
git remote add origin https://github.com/Dushusir/lwa.git
git remote set-url origin https://Dushusir@github.com/Dushusir/lwa.git
git config --local credential.helper store
git push -u origin master

详细理解多账户:

git多账户管理: 区分全局账户和本地账户

git tag 打标签

在commit之后

git tag -a release-v0.0.0 -m "内容"
git push origin release-v0.0.0

git 撤销 add commit 操作：

git reset HEAD .

参考

https://appsoftea.com/zh/git-init-repository-push-code/