Leaves icon indicating copy to clipboard operation
Leaves copied to clipboard
verified publisher icon LeavesMC

Upload to cloud

Open LittleChest opened this issue 1 year ago • 4 comments

LittleChest avatar May 12 '24 16:05 LittleChest

又在主分支。。。

Bluemangoo avatar May 12 '24 23:05 Bluemangoo

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

@MC-XiaoHei

Bluemangoo avatar May 12 '24 23:05 Bluemangoo

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

@MC-XiaoHei

cherry-pick

LittleChest avatar May 13 '24 09:05 LittleChest

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

cherry-pick

要修冲突的。

Bluemangoo avatar May 13 '24 09:05 Bluemangoo

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

Bluemangoo avatar May 20 '24 23:05 Bluemangoo

合不了啊

s-yh-china avatar May 21 '24 03:05 s-yh-china

6

@LittleChest

Bluemangoo avatar May 21 '24 09:05 Bluemangoo

6

@LittleChest

为什么会有冲突啊

LittleChest avatar May 21 '24 11:05 LittleChest

因为有极大量修改。

Bluemangoo avatar May 21 '24 11:05 Bluemangoo

6 @LittleChest

为什么会有冲突啊

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

LittleChest avatar May 21 '24 11:05 LittleChest