Labels Milestones

球球让我合并吧QAQ #6

Open

polumc3qf wants to merge 9 commits from developer into main

pull from: developer

merge into: pzvjlefpx:main

pzvjlefpx:main

pzvjlefpx:zhuyingjie_branch

pzvjlefpx:liyunlong_branch

pzvjlefpx:Wangce_branch

pzvjlefpx:MufanShen_branch

pzvjlefpx:Zhangkaiqile_branch

Conversation 0 Commits 9 Files Changed 742

polumc3qf commented 2 months ago

Collaborator

222

222

polumc3qf added 9 commits 2 months ago

fa32779df6 developer test

7d4f1eb894 xiaominotesUML.pdf

d32966dacd src

31b62f37c1 src

dbc3c3d6c9 Merge pull request '球球让我合并吧QAQ' (#1) from zhuyingjie_branch into developer

2709413947 src

0fa276ecf4 annotation

d5b590c929 SRC_annotation

aed615c688 Merge pull request 'QAQ让我合并！！！！！！！！！！' (#3) from zhuyingjie_branch into developer

This pull request has changes conflicting with the target branch.

src/note_but_github/.gradle/7.5/executionHistory/executionHistory.lock

src/note_but_github/.gradle/7.5/fileHashes/fileHashes.bin

src/note_but_github/.gradle/7.5/fileHashes/resourceHashesCache.bin

doc/developer test.txt

src/note_but_github/.gradle/7.5/checksums/checksums.lock

src/note_but_github/.gradle/7.5/fileHashes/fileHashes.lock

src/note_but_github/.gradle/buildOutputCleanup/buildOutputCleanup.lock

src/note_but_github/.gradle/buildOutputCleanup/outputFiles.bin

src/note_but_github/.gradle/7.5/checksums/sha1-checksums.bin

src/note_but_github/.gradle/7.5/executionHistory/executionHistory.bin

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: pzvjlefpx/gitProject#6

Write Preview

Loading…

Cancel

Save

There is no content yet.