From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>, git@vger.kernel.org
Subject: Re: Strange "git stash pop" conflict (one chunk out of many)
Date: Sat, 17 Dec 2022 08:58:20 +0700 [thread overview]
Message-ID: <ced6bacc-3d77-4d24-33f3-a93d2ae7a131@gmail.com> (raw)
In-Reply-To: <639B074B020000A100050792@gwsmtp.uni-regensburg.de>
On 12/15/22 18:38, Ulrich Windl wrote:
> 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}});
>
Both sides are identical? You can freely choose either side...
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2022-12-17 2:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 11:38 Strange "git stash pop" conflict (one chunk out of many) Ulrich Windl
2022-12-17 1:58 ` Bagas Sanjaya [this message]
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=ced6bacc-3d77-4d24-33f3-a93d2ae7a131@gmail.com \
--to=bagasdotme@gmail.com \
--cc=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).