-
Notifications
You must be signed in to change notification settings - Fork 88
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
Feature: force merge #608
Feature: force merge #608
Conversation
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## 2.x #608 +/- ##
==========================================
+ Coverage 59.67% 59.81% +0.13%
==========================================
Files 268 274 +6
Lines 8863 9040 +177
Branches 1618 1564 -54
==========================================
+ Hits 5289 5407 +118
- Misses 3180 3219 +39
- Partials 394 414 +20
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Replaced label v2.6.0 with v2.x due to the 2.6.0 release code cut off. |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport/backport-608-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a7a2ad9b721d3bba353dcfeb2618248456af7ebc
# Push it to GitHub
git push --set-upstream origin backport/backport-608-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main Then, create a pull request where the |
* temp: save Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add validator Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add cypress test Signed-off-by: suzhou <suzhou@amazon.com> * feat: try to get cypress test start Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: force merge optimize Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify toast message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: add debounce Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: update unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: make unit test run Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify id Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: remove useless code Signed-off-by: suzhou <suzhou@amazon.com> * feat: update message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add readonly detect Signed-off-by: suzhou <suzhou@amazon.com> * feat: protect Signed-off-by: suzhou <suzhou@amazon.com> * feat: use the specific reason when force merge failed Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> --------- Signed-off-by: suzhou <suzhou@amazon.com> (cherry picked from commit a7a2ad9)
* temp: save Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add validator Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add cypress test Signed-off-by: suzhou <suzhou@amazon.com> * feat: try to get cypress test start Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: force merge optimize Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify toast message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: add debounce Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: update unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: make unit test run Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify id Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: remove useless code Signed-off-by: suzhou <suzhou@amazon.com> * feat: update message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add readonly detect Signed-off-by: suzhou <suzhou@amazon.com> * feat: protect Signed-off-by: suzhou <suzhou@amazon.com> * feat: use the specific reason when force merge failed Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> --------- Signed-off-by: suzhou <suzhou@amazon.com> (cherry picked from commit a7a2ad9)
* temp: save Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add validator Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: add cypress test Signed-off-by: suzhou <suzhou@amazon.com> * feat: try to get cypress test start Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: force merge optimize Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify toast message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: add debounce Signed-off-by: suzhou <suzhou@amazon.com> * feat: update validation Signed-off-by: suzhou <suzhou@amazon.com> * feat: update unit test Signed-off-by: suzhou <suzhou@amazon.com> * feat: make unit test run Signed-off-by: suzhou <suzhou@amazon.com> * feat: modify id Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: remove useless code Signed-off-by: suzhou <suzhou@amazon.com> * feat: update message Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> * feat: add readonly detect Signed-off-by: suzhou <suzhou@amazon.com> * feat: protect Signed-off-by: suzhou <suzhou@amazon.com> * feat: use the specific reason when force merge failed Signed-off-by: suzhou <suzhou@amazon.com> * feat: update Signed-off-by: suzhou <suzhou@amazon.com> --------- Signed-off-by: suzhou <suzhou@amazon.com> (cherry picked from commit a7a2ad9)
Description
[Describe what this change achieves]
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.