public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx•de>
To: Nikolay Shustov <nikolay.shustov@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: git merge --no-ff failure
Date: Fri, 26 Sep 2025 11:55:11 +0200 (CEST)	[thread overview]
Message-ID: <1f78a660-3c1b-7aea-5b3e-945ec2b1ad80@gmx.de> (raw)
In-Reply-To: <5cbb5c0a-4c51-4d15-816d-6d7d4fdf4fe1@gmail.com>

Hi Nikolay,

On Thu, 25 Sep 2025, Nikolay Shustov wrote:

> Git is reporting error while I am trying to run "git merge --no-ff <my 
> branch>":
> 
> fatal: stash failed.

That is indeed a bit terse on Git's side. Can you still reproduce? If so,
can you run the `git stash create` command on its own, maybe there is a
more helpful error message there?

Thanks,
Johannes

  parent reply	other threads:[~2025-09-26  9:55 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
2025-09-26  9:55 ` Johannes Schindelin [this message]
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=1f78a660-3c1b-7aea-5b3e-945ec2b1ad80@gmx.de \
    --to=johannes.schindelin@gmx$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=nikolay.shustov@gmail$(echo .)com \
    /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