* 'git stash' in one subfolder fails because some other subfolder has unmerged files
@ 2023-11-01 18:44 Yuri
0 siblings, 0 replies; only message in thread
From: Yuri @ 2023-11-01 18:44 UTC (permalink / raw)
To: Git Mailing List
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-01 18:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-01 18:44 'git stash' in one subfolder fails because some other subfolder has unmerged files Yuri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox