[ipxe-devel] Can't revert 6324bd commit

[Shao Miller]

Good day to you.

This does not appear to be an error with iPXE.  This appears to be an error
with what you are doing with 'git'.  You can look at 'git status' after your
failing command to see more about what files are involved.  - Shao

________________________________________
From: ipxe-devel-bounces at lists.ipxe.org
[mailto:ipxe-devel-bounces at lists.ipxe.org] On Behalf Of hai wu
Sent: Monday, December 03, 2012 01:52
To: ipxe-devel at lists.ipxe.org
Subject: [ipxe-devel] Can't revert 6324bd commit

Before "git revert -n 6324bd" worked fine, but with latest ipxe git
checkout, this command fails with the following message:

error: could not revert 6324bd9... [undi] Allow underlying PXE stack to
construct link-layer header
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'

Not sure if there could be some workaround to the above.