{"thread":{"id":"60453","subject":"'git stash' in one subfolder fails because some other subfolder has unmerged files","startedAt":"2023-11-01T18:44:26Z","lastAt":"2023-11-01T18:44:26Z","messageCount":1,"participants":["Yuri"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"484308","messageId":"5c8a94e6-6691-45e6-bcb3-04fa472ae9ad@rawbw.com","threadId":"60453","inReplyTo":null,"subject":"'git stash' in one subfolder fails because some other subfolder has unmerged files","fromName":"Yuri","fromEmail":"yuri@rawbw.com","sentAt":"2023-11-01T18:44:24Z","receivedAt":"2023-11-01T18:44:26Z","isPatch":false,"sender":{"key":"yuri@rawbw.com","avatar":null},"body":"Here is the log:\n\n[yuri@yv /usr/ports/audio/giada]$ git stash push -m \"audio/giada: Update \nto 0.26.0 has run-time issues\" -- /usr/ports/audio/gia\nda\naudio/triceratops-lv2/Makefile: needs merge\naudio/triceratops-lv2/pkg-descr: needs merge\naudio/triceratops-lv2/pkg-plist: needs merge\nscience/py-dftbplus/Makefile: needs merge\nscience/py-dftbplus/distinfo: needs merge\nscience/py-dftbplus/pkg-descr: needs merge\n\n\n\n\n\n\nI asked git to stash only the audio/giada subfolder. Unmerged files in \nscience/py-dftbplus and audio/triceratops-lv2 shouldn't prevent stashing \nfiles in audio/giada.\n\n\n\n\n\n\n\nI believe that this is a bug.\n\n\n\n\n\n\n\nThanks,\nYuri\n\n"}]}