From: Nikolay Shustov <nikolay.shustov@gmail•com>
To: git@vger•kernel.org
Subject: Re: git merge --no-ff failure
Date: Thu, 25 Sep 2025 10:30:45 -0400 [thread overview]
Message-ID: <0905d418-7693-485e-8646-a7e4413e6c0b@gmail.com> (raw)
In-Reply-To: <5cbb5c0a-4c51-4d15-816d-6d7d4fdf4fe1@gmail.com>
Just wanted to add to the initial bug report: the same scenario works on
Linux fine (when git p4 repo is hosted on Linux).
On 9/25/25 09:31, Nikolay Shustov wrote:
> Hi,
> Git is reporting error while I am trying to run "git merge --no-ff <my
> branch>":
>
> fatal: stash failed.
>
> Please see attached the bug report, the output for same command with
> trace2 enabled and output for the same command with trace2 and events
> enabled.
>
> Cheers,
> - Nikolay
next prev parent reply other threads:[~2025-09-25 14:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 13:31 git merge --no-ff failure Nikolay Shustov
2025-09-25 14:30 ` Nikolay Shustov [this message]
2025-09-26 9:55 ` Johannes Schindelin
2025-09-26 14:03 ` Nikolay Shustov
2025-09-26 17:41 ` Eric Sunshine
[not found] ` <CAEcERAxiuSAvpPCzsWSpoNQRmbgF0B92augTVgSqNN1jb7mJYA@mail.gmail.com>
2025-09-28 2:34 ` Nikolay Shustov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0905d418-7693-485e-8646-a7e4413e6c0b@gmail.com \
--to=nikolay.shustov@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox