Skip to content

docs: sync develop to master, update club intro and new student guide - #40

Merged
Old-cpu merged 6 commits into
masterfrom
develop
Sep 22, 2026
Merged

Old-cpu merged 6 commits into
masterfrom
develop

Conversation

@CapableCCat

Copy link
Copy Markdown
Collaborator

摘要

本次提交将 develop 分支上的最新文档更新同步到 master 分支,以确保主分支保持最新。

修改内容

  • 更新了俱乐部介绍和新学生指南。
  • 更新了俱乐部主要成员名单(新增了2026年执行委员会成员)。

相关信息与致谢

维护者说明

原始提交 #37 与 develop 分支存在冲突。为遵循仓库规则并保持线性历史,本地对提交进行了重新基于,并解决了冲突。未引入合并提交。

@CapableCCat
CapableCCat requested a review from Old-cpu September 22, 2026 09:00
@Old-cpu
Old-cpu enabled auto-merge September 22, 2026 09:04
@Old-cpu

Old-cpu commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

LGTM

@Old-cpu
Old-cpu disabled auto-merge September 22, 2026 09:06
@Old-cpu
Old-cpu added this pull request to the merge queue Sep 22, 2026
Merged via the queue into master with commit 94844d8 Sep 22, 2026
2 checks passed
@Old-cpu
Old-cpu deleted the develop branch September 22, 2026 09:07
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.

4 participants