Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue #86 #87

Merged
merged 16 commits into from
Dec 17, 2023
Merged

Fixes issue #86 #87

merged 16 commits into from
Dec 17, 2023

Conversation

KikkiZ
Copy link
Contributor

@KikkiZ KikkiZ commented Dec 13, 2023

The document has been updated with a few additional changes to the links in the document.

In the process of updating, I accidentally synchronized my updates to the code to the repo, I have tried to roll back, not sure if it really solved the error.

PS: This update looks like a huge one, the documentation has changed a lot

README.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
@northword
Copy link
Collaborator

In the process of updating, I accidentally synchronized my updates to the code to the repo, I have tried to roll back, not sure if it really solved the error.

这个包含以往的提交,是因为上一次 PR 是以 squash 的方式合并进仓库的,这意味着 PR 发起(from)分支的所有提交将被压缩为一个提交进入本仓库 main 分支;而 sync to upstream 是创建一个 merge 提交到 fork 仓库,这使得 upstream/main 与 fork/main 无法保持一致。

当向其他仓库 PR 时,最好在新的分支中(从upstream/main 创建分支)提交内容然后发起 PR。

现在的 main 可以在本地强制推送以和本仓库的提交记录保持一致。

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
doc/README-zhCN.md Outdated Show resolved Hide resolved
src/modules/examples.ts Outdated Show resolved Hide resolved
@KikkiZ
Copy link
Contributor Author

KikkiZ commented Dec 17, 2023

I rolled back all the links in the English document to their original state, and then I only modified a few punctuation marks in the document, and added a git homepage link.
I also changed the hidden links in the Chinese document to be directly displayed, but I still added necessary descriptions before the links so that users can understand the function of the links. If you think this supplement is unnecessary, I can change it back to its original appearance.

@windingwind windingwind merged commit be0b82f into windingwind:main Dec 17, 2023
@windingwind
Copy link
Owner

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants