RE: [PULL v4 ] administration commands for device parts

[Cornelia Huck <cohuck@redhat.com>]

On Sun, Jul 14 2024, Parav Pandit <parav@nvidia.com> wrote:

> However, with commit [1], hitting below error for makediffpdf.sh and makediffhtml.sh too.
> 	
> HEAD is now at b495841 transport-mmio: fix up makediff from 1.2
> Applying editorial: allow for longer device id table: makediff 1.3
> [detached HEAD d213eb3] editorial: allow for longer device id table: makediff 1.3
>  Author: Cornelia Huck <cohuck@redhat.com>
>  Date: Mon Oct 30 14:42:05 2023 +0100
>  1 file changed, 2 insertions(+), 2 deletions(-)
> Applying admin: Prepare table for multipage listing
> Auto-merging makediff.sh
> CONFLICT (content): Merge conflict in makediff.sh
> error: could not apply c69ccb2... makediff: cherry pick table env change
> hint: After resolving the conflicts, mark them with
> hint: "git add/rm <pathspec>", then run
> hint: "git cherry-pick --continue".
> hint: You can instead skip this commit with "git cherry-pick --skip".
> hint: To abort and get back to the state before "git cherry-pick",
> hint: run "git cherry-pick --abort".
>
> [1] https://github.com/oasis-tcs/virtio-spec/commit/c69ccb2f16e09e5dab9b9399b72b701d51f26b6a
> [2] https://lore.kernel.org/virtio-comment/20240714221837.3323459-1-parav@vr-arch-host06.mtvr.labs.mlnx/T/#u

Changed line numbers probably throw it off... maybe using a different
merge strategy for the cherry pick would make it succeed?