Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-7341

Stashing and restoring the stash needs manual 'git status' to work

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Low
    • None
    • 4.0
    • Git, GitLab
    • None
    • Severity 2 - Major

    Description

      Sourcetree 4.0.1

      If I stash all my unstaged changes, and apply the stash again immediately, I receive the message: "error: Your local changes to the following files would be overwritten by merge:". Even though there are no local changes at this time.

      Going into a console and typing 'git status' will clear the status and allow me to apply the stash again. So Sourcetree is apparently not correctly updating the git status after doing a stas, even though I don't see any files anymore in the 'File status'.

      Attachments

        Activity

          People

            Unassigned Unassigned
            73fe36d53aa8 Peter de Vroomen
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: