AlexStocks commented on PR #1409:
URL: https://github.com/apache/dubbo-admin/pull/1409#issuecomment-6380137618

   补充一点状态更新(相对上面那条审查意见):
   
   当前 `develop` 已推进到 `f1c3f3a`,重新做三方合并检测后,本 PR **新增了一处文本冲突**:
   
   ```
   $ git merge-tree --write-tree origin/develop pr/1409
   CONFLICT (content): Merge conflict in ui-vue3/src/Login.vue
   ```
   
   也就是说本 PR 唯一修改的文件 `ui-vue3/src/Login.vue` 已经在 `develop` 上被改动过,PR 现有的 diff 
无法直接应用。结合之前实测的两点:
   
   1. `npx [email protected] --check src/Login.vue`(使用仓库自己的 
`ui-vue3/.prettierrc.json`)在 PR 的 Head `c362767` 上 `exit 1`,差异恰为 3 行尾随空格,CI 里 
`Check Code Format: make fmt && git status && [[ -z $(git status -s) ]]` 必然失败;
   2. PR 描述里提到的 `limits_test.go` Windows 修复在 Diff 中并不存在,该路径在 `develop` 上也不存在。
   
   因此建议:先 rebase 到当前 `develop`、在解冲突时一并去掉那 3 行尾随空格、并修正 PR 描述使其与实际改动一致。在此之前这个 PR 
无法进入合并流程。
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to