[Improvement][CI] Remove rebase check in pr.

[ruanwenjun]

Search before asking

• I had searched in the issues and found no similar feature requirement.

Description

Right now, we need to rebase the pr to latest dev branch before merged.

If we have 10 pr need to merge, we need to rebase one by one, if there is not conflict, this is not needed.

Are you willing to submit a PR?

• Yes I am willing to submit a PR!

Code of Conduct

• I agree to follow this project's Code of Conduct

[xjlgod]

please assign to me.

[ruanwenjun]

please assign to me.

Assigned

[xjlgod]

please assign to me.

Assigned

I tried using GitHub Action cirrus-actions/rebase@1.8 for implementation. But we can't use the built-in secrets.GITHUB_TOKEN because of this limitation, So we need personal token from forked repo(it's difficult to get), and I don't think this is not a good implementation method. Do you have any other suggestions?

[ruanwenjun]

please assign to me.

Assigned

I tried using GitHub Action cirrus-actions/rebase@1.8 for implementation. But we can't use the built-in secrets.GITHUB_TOKEN because of this limitation, So we need personal token from forked repo(it's difficult to get), and I don't think this is not a good implementation method. Do you have any other suggestions?

We might not need to add action, I find in other projects there is no rebase check, so we might only need to close some setting.

[xjlgod]

I think we can use squash and merge for merging, and if there are no conflicts, it can automatically squash the commits. If we choose rebase merging, it can not squash.

[ruanwenjun]

I think we can use `squash and merge` for merging, and if there are no conflicts, it can automatically squash the commits. If we choose `rebase merging`, it can not squash.

cc @zhongjiajie Can we change the setting?

[zhongjiajie]

hi @ruanwenjun the reason we add this is due to this #14530. because we meet some unexpected ci error when we merge multi pr without rebase the latest code

[xjlgod]

maybe we can update branch then use squash？

[ruanwenjun]

hi @ruanwenjun the reason we add this is due to this #14530. because we meet some unexpected ci error when we merge multi pr without rebase the latest code

OK, make sense.

[ruanwenjun]

maybe we can update branch then use squash？

As @zhongjiajie said, we need to make the pr updated before trigger the ci, then we need to keep, thanks, I will close this issue.