沙漠之子

Results 77 comments of 沙漠之子

Refer to Shell Script Implementation My own script: [ci_commit_with_signature.sh](https://gist.github.com/maboloshi/9b88314526fc688b0bcf9cab15bc0240)

@TC999 请解决好冲突,我这边没法操作,权限补足

> > 还是冲突 请您解决一下 > > 哪里冲突了,更改视图没显示 冲突太多了 需要命令行进行上游合并

已合并 [3dbc06b](https://github.com/maboloshi/github-chinese/commit/3dbc06b621e6161cb35200a40579a6d85b0f793e)

请在您的web仓库中点击 ![image](https://github.com/maboloshi/github-chinese/assets/7850715/1f9882ff-bf70-4cb3-b3ea-26aa90daf475)按钮进行强制同步后 再更新您的内容

> 有劳翻译一下,拉取请求页面 #230 ![image](https://private-user-images.githubusercontent.com/88823709/346252739-0479185a-46b8-4325-bad1-b56a107ce16d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjAyNDM0MDEsIm5iZiI6MTcyMDI0MzEwMSwicGF0aCI6Ii84ODgyMzcwOS8zNDYyNTI3MzktMDQ3OTE4NWEtNDZiOC00MzI1LWJhZDEtYjU2YTEwN2NlMTZkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA3MDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNzA2VDA1MTgyMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBkYjBlZjMwNjA5YWE4Y2Y3ZGRkYmRjMDE5NjI3ZGE4MWZkNzk4N2U3YWQ2MWM0MTk3NGNhOGIxMWVlY2Q3ZGEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.syrOGovjRfafaPg87C6tXbE2M70AyB4nqs_IYzOcWg0) 红线词条做下正则匹配(暂时无效,帮忙修改一下): > > ``` > [/Comment on lines? (\d+) to (\d+)/, "对 $1 到 $2 行发表评论"], > ``` > > * 注:前面的数字会带+或-号 此处静态词 ![image](https://github.com/maboloshi/github-chinese/assets/7850715/ea2b140e-98ad-4990-86d5-8c8a248c1ea3)

> 嗯?有合并冲突…… 我随便找个PR测试规则 哈哈 这个PR 时间太长了 可能需要原作者维护更新

截图1 是因为我已标记解决的缘故

`Suggested change`估计被什么规则屏蔽了