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

Update SUPPORT.md #2604

Closed
wants to merge 1 commit into from
Closed

Update SUPPORT.md #2604

wants to merge 1 commit into from

Conversation

nohwnd
Copy link
Member

@nohwnd nohwnd commented Jan 9, 2025

PR Summary

PR Checklist

  • PR has meaningful title
  • Summary describes changes
  • PR is ready to be merged
    • If not, use the arrow next to Create Pull Request to mark it as a draft. PR can be marked Ready for review when it's ready.
  • Tests are added/update (if required)
  • Documentation is updated/added (if required)

@nohwnd
Copy link
Member Author

nohwnd commented Jan 9, 2025

/backport to rel/5.x.x

Copy link

github-actions bot commented Jan 9, 2025

Started backporting to rel/5.x.x: https://github.com/pester/Pester/actions/runs/12698614239

Copy link

github-actions bot commented Jan 9, 2025

@nohwnd backporting to rel/5.x.x failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Update SUPPORT.md
Using index info to reconstruct a base tree...
M	SUPPORT.md
Falling back to patching base and 3-way merge...
Auto-merging SUPPORT.md
CONFLICT (content): Merge conflict in SUPPORT.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update SUPPORT.md
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@nohwnd nohwnd closed this Jan 9, 2025
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