Ubuntu
git package

  1. Bug #2026319
  2. Comment #11

Comment 11 for bug 2026319

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package git - 1:2.34.1-1ubuntu1.10

---------------
git (1:2.34.1-1ubuntu1.10) jammy; urgency=medium

  * Fix issue where untracked files are not recovered during a stash
    pop/apply operation when a merge conflict is present. Untracked
    files are now correctly restored regardless if a conflict is
    present or not. (LP: #2026319)
    - d/p/lp-2026319-stash-do-not-return-before-restoring-untracked-files.patch

 -- Matthew Ruffell <email address hidden> Fri, 07 Jul 2023 14:31:14 +1200