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

[Workflow] Introduce a conflict #42

Merged
merged 1 commit into from
Feb 26, 2024
Merged

[Workflow] Introduce a conflict #42

merged 1 commit into from
Feb 26, 2024

Conversation

rak-phillip
Copy link
Owner

Summary

Fixes #

Occurred changes and/or fixed issues

Technical notes summary

Areas or cases that should be tested

Areas which could experience regressions

Screenshot/Video

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes

@rak-phillip rak-phillip merged commit 72d4273 into master Feb 26, 2024
2 of 25 checks passed
@rak-phillip rak-phillip deleted the test/intro-conflict branch February 26, 2024 22:52
@rak-phillip
Copy link
Owner Author

/backport v99.99.99 release-99.99.99

Copy link

Not creating port PR, there was an error running git am -3:

Applying: Introduce a conflict
Using index info to reconstruct a base tree...
M	pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
Falling back to patching base and 3-way merge...
Auto-merging pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
CONFLICT (content): Merge conflict in pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Introduce a conflict
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Repository owner deleted a comment from github-actions bot Feb 27, 2024
Repository owner deleted a comment from github-actions bot Feb 27, 2024
Repository owner deleted a comment from github-actions bot Feb 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant