* [dpdk-test-report] |FAILURE| pw(75536) [22/22] Move all files under windows folder
@ 2020-08-14 6:56 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-08-14 6:56 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/75536
_apply issues_
Submitter: Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
Date: 2020-08-13 23:21:45
Reply_mail: 1597360905-74106-23-git-send-email-navasile@linux.microsoft.com
DPDK git baseline:
Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02
* Repo: dpdk
CONFLICT (content): Merge conflict in .gitignore
Auto-merging .gitattributes
CONFLICT (add/add): Merge conflict in .gitattributes
error: Failed to merge in the changes.
Patch failed at 0013 Update .gitignore and create .gitattributes
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-14 6:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-14 6:56 [dpdk-test-report] |FAILURE| pw(75536) [22/22] Move all files under windows folder sys_stv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).