Skip to content

Fix conflict #10902

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 15 commits into from
Aug 1, 2025
Merged

Fix conflict #10902

merged 15 commits into from
Aug 1, 2025

Conversation

risemeup1
Copy link
Contributor

Before submitting

  • Lint code. If there are lint issues, please format the code first.
# Install and register `pre-commit` in the project folder
pip install pre-commit && pre-commit install

# Process previous code files separately
pre-commit run --file XXXX.py
  • Add test cases into tests folder. If there are codecov issues, please add tests cases first.

PR types

Others

PR changes

Others

Description

fix conflict

@paddle-bot Paddle-bot
Copy link

paddle-bot bot commented Jul 31, 2025

Thanks for your contribution!

@phlrain phlrain merged commit 48e3e32 into PaddlePaddle:dsv3_dev Aug 1, 2025
2 of 5 checks passed
chen2016013 added a commit to chen2016013/PaddleNLP that referenced this pull request Aug 5, 2025
@chen2016013
Revert "Fix conflict (PaddlePaddle#10902)"
8e70a86 
This reverts commit 48e3e32.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangbo9674 zhangbo9674 zhangbo9674 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@risemeup1 @zhangbo9674 @phlrain