请求合并 #5

Merged

psq5hzxpo merged 20 commits from master into main

psq5hzxpo commented

Owner

There is no content yet.

psq5hzxpo added 20 commits

9eb9b64e4b 删除测试信息，创建doc和src文件夹，创建master，develop，luhaozhe_branch，cuijiaxiang_branch分支，将当前版本放在master分支下

fea126dc82 删除原先测试信息，测试文件夹是否可以上传，创建src和doc文件夹

62002be2b7 测试

b3b103a163 上传小米便签代码，创建文档“列出小米便签的基本功能.docx”

a9e6563e2f 小米便签基本功能

b7375dd402 删除没用的doc

d05c06ee5f Merge branch 'luhaozhe_branch' of https://bdgit.educoder.net/psq5hzxpo/git-test

942bfba45a 小米便签基本功能

1705153a02 Merge branch 'cuijiaxiang_branch' of https://bdgit.educoder.net/psq5hzxpo/git-test

2abb452beb update

af96713165 update

eeaea70d49 Merge pull request 'update' (#2 ) from cuijiaxiang_branch into master

279dae593e 小米便签泛读报告（类）

6755e621d7 小米便签泛读报告（类）

fa59987340 update

e10c357513 update

2978e0379a Merge branch 'luhaozhe_branch' of https://bdgit.educoder.net/psq5hzxpo/git-test

75a7a84b5e update

2f334dde3f ADD file via upload

90c56ccb3b Merge branch 'master' of https://bdgit.educoder.net/psq5hzxpo/git-test

# Conflicts:
#	doc/小米便签泛读报告.docx

psq5hzxpo merged commit 2799348116 into main 2 months ago

psq5hzxpo referenced this issue from a commit

Merge pull request '请求合并' (#5) from master into main

The pull request has been merged as 2799348116.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: psq5hzxpo/git-test#5