From: "Ulrich Windl" <Ulrich.Windl@rz.uni-regensburg.de>
To: <git@vger.kernel.org>
Subject: Strange "git stash pop" conflict (one chunk out of many)
Date: Thu, 15 Dec 2022 12:38:51 +0100 [thread overview]
Message-ID: <639B074B020000A100050792@gwsmtp.uni-regensburg.de> (raw)
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
next reply other threads:[~2022-12-15 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 11:38 Ulrich Windl [this message]
2022-12-17 1:58 ` Strange "git stash pop" conflict (one chunk out of many) Bagas Sanjaya
2022-12-17 10:45 ` Phillip Wood
2022-12-19 7:16 ` Antw: [EXT] " Ulrich Windl
2022-12-17 10:44 ` Phillip Wood
[not found] ` <967939F9020000A8CE842B1F@gwsmtp.uni-regensburg.de>
[not found] ` <63A012F0020000A10005084B@gwsmtp.uni-regensburg.de>
2022-12-19 7:31 ` Wtrlt: Antw: [EXT] " Ulrich Windl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=639B074B020000A100050792@gwsmtp.uni-regensburg.de \
--to=ulrich.windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).