On Thu, Nov 06, 2014 at 08:01:14AM +0100, Paul Menzel wrote: > 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?
Changelog entries should NEVER be part of the code commit since it forces your commits to only be able to applied in one order. And the git log should already be your changelog so the changelog serves no purpose other than to make life difficult for people. Same goes for version numbers in source files. -- Len Sorensen _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
