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

docs: update README with Keriyar's blog #14

Merged
merged 19 commits into from
Aug 1, 2024
Merged

docs: update README with Keriyar's blog #14

merged 19 commits into from
Aug 1, 2024

Conversation

Keriyar
Copy link
Contributor

@Keriyar Keriyar commented Aug 1, 2024

Keriyar's blog:
http://www.keriyar.cn

@mslxl
Copy link
Contributor

mslxl commented Aug 1, 2024

主分支之前将您的分支先进行了 squash 再合并,如果你需要将同步更改的话应该采用以下两种方式之一:

  • 使用 rebase/reset 同步
  • 将仓库删除重新 fork。

像现在使用merge(您的 commit c984739 是 merge操作)的话会使 bebfbdd...01470e5 这些commits重复出现,使历史 commit 变的特别乱。

以后有碎片时间的话不妨玩一下 git 分支学习,这次麻烦您修改一下 .all-contributorsrc 文件就 ok 了

update keriyar's profile with http://www.keriyar.cn
@mslxl mslxl merged commit 1c5188b into sdufeACM:main Aug 1, 2024
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.

2 participants