|WARNING| pw153422 [PATCH] doc: reword contributor's guidelines

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/153422

_apply patch failure_

Submitter: Nandini Persad <nandinipersad361 at gmail.com>
Date: Monday, May 12 2025 14:48:41 
Applied on: CommitID:2bf836de46d36a81f9321f947fbfce52b3180782
Apply patch set 153422 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: origin/main
Checked out to main (2bf836de46d36a81f9321f947fbfce52b3180782)
Done: main commit 2bf836de46d36a81f9321f947fbfce52b3180782
Trying to checkout branch: origin/main
Checked out to main (2bf836de46d36a81f9321f947fbfce52b3180782)
Applying patch...

Failed to apply patch:
Applying: doc: reword contributor's guidelines
Using index info to reconstruct a base tree...
M	doc/guides/contributing/patches.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/contributing/patches.rst
CONFLICT (content): Merge conflict in doc/guides/contributing/patches.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 doc: reword contributor's guidelines
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".


https://lab.dpdk.org/results/dashboard/patchsets/33158/

UNH-IOL DPDK Community Lab