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

Upload to cloud #215

Merged
merged 7 commits into from
May 23, 2024
Merged

Upload to cloud #215

merged 7 commits into from
May 23, 2024

Conversation

LittleChest
Copy link
Member

No description provided.

@Bluemangoo
Copy link
Member

又在主分支。。。

@Bluemangoo
Copy link
Member

Bluemangoo commented May 12, 2024

你交到.6那个分支去吧。(

@MC-XiaoHei

@LittleChest
Copy link
Member Author

你交到.6那个分支去吧。(

@MC-XiaoHei

cherry-pick

@Bluemangoo
Copy link
Member

你交到.6那个分支去吧。(
@MC-XiaoHei

cherry-pick

要修冲突的。

@Bluemangoo
Copy link
Member

@s-yh-china 你是不是忘记合并这个了。

@s-yh-china
Copy link
Member

合不了啊

@Bluemangoo
Copy link
Member

6

@LittleChest

@LittleChest
Copy link
Member Author

6

@LittleChest

为什么会有冲突啊

@Bluemangoo
Copy link
Member

因为有极大量修改。

@LittleChest
Copy link
Member Author

6
@LittleChest

为什么会有冲突啊

原来在19小时前同步了1.20.6分支

.github/workflows/build.yml Show resolved Hide resolved
.github/workflows/test.yml Show resolved Hide resolved
@s-yh-china s-yh-china merged commit 6b62f76 into LeavesMC:master May 23, 2024
1 check passed
Lumine1909 pushed a commit to Lumine1909/LeavesFork that referenced this pull request Sep 15, 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.

3 participants