Strange "git stash pop" conflict (one chunk out of many)

From: Ulrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date: Dec 15, 2022, 11:38 UTC
Message-ID: <639B074B020000A100050792@gwsmtp.uni-regensburg.de>

Hi!

This is for a somewhat older git-2.26.2: I had added interactively some changes using edit of a few junks (I tried to structure my big hacking into logical junks when committing). To test whether the partial commit would be consistent, I did a "git stash -k" before committing, and after committing I did a "git stash pop" to continue hacking.

Unfortunately I had a "Merge conflict". Looking at it, it is rather "interesting", however (meaning: I don't understand it). Here is how the conflict looks (to me both variants seem identical):

        # pre-allocate translations and accesskeys
<<<<<<< Updated upstream
        foreach my $attr (LD_SEARCH_ATTR) {
            $attr{$attr} = [translate_attr($attr), undef];
            $attr{$attr}->[1] = add_access_key($aks, 0, $attr{$attr}->[0]);
        }
        foreach my $attr (LD_SEARCH_ATTR) {
=======
        foreach my $attr (LD_SEARCH_ATTR) {
            $attr{$attr} = [translate_attr($attr), undef];
            $attr{$attr}->[1] = add_access_key($aks, 0, $attr{$attr}->[0]);
        }
        foreach my $attr (LD_SEARCH_ATTR) {

>>>>>>> Stashed changes

            @n = (P_P_SRCH_ATTR . $attr, @{$attr{$attr}});

(the other conflict junks look reasonable)

Regards, Ulrich