[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Best practices for bisecting GRUB and cherry-picking?
From: |
Paul Menzel |
Subject: |
Best practices for bisecting GRUB and cherry-picking? |
Date: |
Thu, 06 Nov 2014 08:01:14 +0100 |
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
signature.asc
Description: This is a digitally signed message part
- Best practices for bisecting GRUB and cherry-picking?,
Paul Menzel <=