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

[HEU][CodeStyle][Typos][B-[3-7]] Fix typo(befor, befores, begining,benfit,Betweent,betweeen,bindins) #69640

Merged
merged 8 commits into from
Nov 25, 2024

Conversation

fangfangssj
Copy link
Contributor

@fangfangssj fangfangssj commented Nov 22, 2024

PR Category

User Experience

PR Types

Devs

Description

Fix:

  • befor
  • befores
  • begining
  • benfit
  • Betweent
  • betweeen
  • bindins

Copy link

paddle-bot bot commented Nov 22, 2024

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@paddle-bot paddle-bot bot added the contributor External developers label Nov 22, 2024
@fangfangssj fangfangssj changed the title [CodeStyle][Typos][A-[11-19]] Fix typos (befor, befores, begining,benfit,Betweent,betweeen,bindins) [CodeStyle][Typos][B-[3-7]] Fix typos (befor, befores, begining,benfit,Betweent,betweeen,bindins) Nov 22, 2024
@fangfangssj fangfangssj changed the title [CodeStyle][Typos][B-[3-7]] Fix typos (befor, befores, begining,benfit,Betweent,betweeen,bindins) [CodeStyle][Typos][B-[3-7]] Fix typo(befor, befores, begining,benfit,Betweent,betweeen,bindins) Nov 23, 2024
@fangfangssj fangfangssj marked this pull request as draft November 23, 2024 05:36
@fangfangssj fangfangssj marked this pull request as ready for review November 23, 2024 05:37
auto& befores = ops_before_[i];
for (auto before_op : befores) {
auto& before = ops_before_[i];
for (auto before_op : before) {
for (auto behind_op : behinds) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

从语义上来看,这里 befores 表示的是复数个 before 的 OP,因此可以将其命名改为 before_ops,确保一致性,behinds 也改为 behind_ops

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改

SigureMo
SigureMo previously approved these changes Nov 23, 2024
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMeow 🐾

@SigureMo
Copy link
Member

#69650 重排了下配置顺序,麻烦解决下冲突

@fangfangssj
Copy link
Contributor Author

#69650 重排了下配置顺序,麻烦解决下冲突

已解决

@SigureMo
Copy link
Member

没有解决冲突

@fangfangssj fangfangssj requested a review from SigureMo November 23, 2024 15:08
@fangfangssj
Copy link
Contributor Author

没有解决冲突

您好,想问一下,我只能改成和最新的分支一样的吗,我想删除我已经修改过的部分,但是会报冲突的错误

@SigureMo
Copy link
Member

git checkout develop
git pull
git checkout fix-typos
git checkout develop -- _typos.toml
git commit -m 'restore `_typos.toml`'
# 重新修改 `_typos.toml`
git add _typos.toml
git commit -m 'update `_typos.toml`'

只是建议,自己判断是否应该这样做,出问题别找我,自己搜索解决

@SigureMo
Copy link
Member

实在不行你把 https://github.com/PaddlePaddle/Paddle/blob/develop/_typos.toml 的内容粘贴一下啊……

@fangfangssj
Copy link
Contributor Author

实在不行你把 https://github.com/PaddlePaddle/Paddle/blob/develop/_typos.toml 的内容粘贴一下啊……

我把内容换成和develop一样的是不会报冲突的,但我想把我改过的删除掉,一修改就会报错,
使用git checkout develop -- _typos.toml也没有作用

@SigureMo
Copy link
Member

我把内容换成和develop一样的是不会报冲突的,但我想把我改过的删除掉,一修改就会报错,

不懂,冲突解决是基础,自己学习下吧

@fangfangssj
Copy link
Contributor Author

@MrXnneHang 您好,想问一下PR-CI-APPROVAL没通过,需要别人APPROVAL的情况该怎么做呢

@MrXnneHang
Copy link
Contributor

就是字面意思,需要RD批准,耐心等待即可。

@luotao1 luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Nov 25, 2024
@luotao1 luotao1 merged commit 7dd6f25 into PaddlePaddle:develop Nov 25, 2024
27 of 28 checks passed
@fangfangssj fangfangssj changed the title [CodeStyle][Typos][B-[3-7]] Fix typo(befor, befores, begining,benfit,Betweent,betweeen,bindins) [HEU][CodeStyle][Typos][B-[3-7]] Fix typo(befor, befores, begining,benfit,Betweent,betweeen,bindins) Nov 25, 2024
@luotao1 luotao1 added HappyOpenSource Pro 进阶版快乐开源活动,更具挑战性的任务 and removed HappyOpenSource 快乐开源活动issue与PR labels Nov 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor External developers HappyOpenSource Pro 进阶版快乐开源活动,更具挑战性的任务
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants