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

[Shao Miller]

That is probably because this is more of a development/git challenge than it
is an iPXE one.

It's very nice that the iPXE web-site has instructions for bisecting with
git, but how can it teach you how to write C or resolve conflicts involving
C code?  That seems out-of-scope for iPXE.  Every case will be different; no
general solution.

If you learn more about git, you might have a better chance of resolving git
conflicts.

If someone wants to do the work for you and resolve the conflicts and
publish a branch just for you, to satisfy your particular request, then
you'll be lucky.  Hopefully there aren't many such requests. :)

- Shao Miller

-----Original Message-----
From: Hai Wu [mailto:haiwu.us at gmail.com] 
Sent: Tuesday, December 04, 2012 18:30
To: Shao Miller
Cc: <ipxe-devel at lists.ipxe.org>
Subject: Re: [ipxe-devel] Can't revert 6324bd commit

Yes, it would be nice to be able to revert one commit in ipxe, while there's
no confirmed solution available at the time. This would apply to all commits
in ipxe code, if that commit turns out to cause issue. There's nice
instruction in ipxe website on how to identify which commit is causing issue
using git bisect, but there's no instruction on how to revert that commit.

Sent from my iPod

On Dec 4, 2012, at 5:10 PM, "Shao Miller" <sha0.miller at gmail.com> wrote:

> This seems like a 'git' question, to me.
> 
> Are you asking for someone to provide you with instructions for dealing
with
> the conflicts that you've run into while trying to revert a commit that's
in
> mainline iPXE?  If so, this might involve reviewing all of the code
> involved, editing files, changing code, saving the changes, resolving the
> conflicts.
> 
> - Shao Miller
>