From: Yuri <yuri@rawbw.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: 'git stash' in one subfolder fails because some other subfolder has unmerged files
Date: Wed, 1 Nov 2023 11:44:24 -0700 [thread overview]
Message-ID: <5c8a94e6-6691-45e6-bcb3-04fa472ae9ad@rawbw.com> (raw)
Here is the log:
[yuri@yv /usr/ports/audio/giada]$ git stash push -m "audio/giada: Update
to 0.26.0 has run-time issues" -- /usr/ports/audio/gia
da
audio/triceratops-lv2/Makefile: needs merge
audio/triceratops-lv2/pkg-descr: needs merge
audio/triceratops-lv2/pkg-plist: needs merge
science/py-dftbplus/Makefile: needs merge
science/py-dftbplus/distinfo: needs merge
science/py-dftbplus/pkg-descr: needs merge
I asked git to stash only the audio/giada subfolder. Unmerged files in
science/py-dftbplus and audio/triceratops-lv2 shouldn't prevent stashing
files in audio/giada.
I believe that this is a bug.
Thanks,
Yuri
reply other threads:[~2023-11-01 18:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=5c8a94e6-6691-45e6-bcb3-04fa472ae9ad@rawbw.com \
--to=yuri@rawbw.com \
--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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox