From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1XmH4o-00078D-LC for mharc-grub-devel@gnu.org; Thu, 06 Nov 2014 02:01:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmH4f-00076n-CU for grub-devel@gnu.org; Thu, 06 Nov 2014 02:01:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmH4X-0003ty-Uf for grub-devel@gnu.org; Thu, 06 Nov 2014 02:01:41 -0500 Received: from mail.gw90.de ([188.40.100.199]:38216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmH4X-0003tD-OT for grub-devel@gnu.org; Thu, 06 Nov 2014 02:01:33 -0500 Received: from [37.120.14.96] (helo=mattotaupa) by mail.gw90.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XmH4P-0004pg-K7 for grub-devel@gnu.org; Thu, 06 Nov 2014 07:01:26 +0000 Message-ID: <1415257274.6322.50.camel@users.sourceforge.net> Subject: Best practices for bisecting GRUB and cherry-picking? From: Paul Menzel To: grub-devel@gnu.org Date: Thu, 06 Nov 2014 08:01:14 +0100 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-C6XODNDjuFeKdN8sbzBu" X-Mailer: Evolution 3.12.7-1 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 188.40.100.199 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2014 07:01:48 -0000 --=-C6XODNDjuFeKdN8sbzBu Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Dear GRUB folks, trying to a bisect a regression of AHCI on the ASRock E350M1 with coreboot and GRUB as firmware, `ChangeLog` poses a problem when resetting to an older commit and then cherry-picking certain commits to fix other problems. The problem is that of course conflicts are shown. Do you know how to circumvent that to avoid manually resolving the conflicts? Thanks, Paul --=-C6XODNDjuFeKdN8sbzBu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlRbHMAACgkQPX1aK2wOHVg9rgCeMErL51NX/ZN6aN+6GXSyXs+t g1oAniXmtQ/9TYXTh2HvBTwbl3wvQsJX =+an1 -----END PGP SIGNATURE----- --=-C6XODNDjuFeKdN8sbzBu--