Re: Strange "git stash pop" conflict (one chunk out of many)
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Dec 17, 2022, 10:44 UTC
- Message-ID
- <6c8e8271-432f-38e3-e70e-1445f874afc6@dunelm.org.uk>
- In-Reply-To
- <639B074B020000A100050792@gwsmtp.uni-regensburg.de>
Hi Ulrich
On 15/12/2022 11:38, Ulrich Windl wrote:
Show 8 quoted lines
> 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):
Yes, it does look "interesting". Did you make any changes between running "git stash -k" and "git stash pop"? I did wonder if there had been some whitespace changes where spaces were replaced with tabs or vice-versa ("git stash" uses "git apply" to create the stash so if you have apply.whitespace set to "fix" the stashed changes will not necessarily match those in the working copy) but diffing the two sides of the conflict does not show any changes.
Best Wishes
Phillip
Show 24 quoted lines
> # 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
>
>
>
>