Uploaded image for project: 'Appcelerator Studio'
  1. Appcelerator Studio
  2. TISTUD-6731

Studio: Checking out a new branch carries over working copy changes

    Details

    • Type: Bug
    • Status: Open
    • Priority: None
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: Editor
    • Environment:

      Studio 3.3.0.201406200844

      Description

      When I use Studio to switch branches of a project and the working copy has changes, most of the times I do not get the expected warning that git gives on the command line:

      (~/dev/apps/tutorial)--(searchbar*)--(3.2.3.GA‡1.4.0-rc)
      ≫ git checkout master
      error: Your local changes to the following files would be overwritten by checkout:
      	README.md
      Please, commit your changes or stash them before you can switch branches.
      Aborting
      

      Instead, Studio just checks out the requested branch and carries over any changes to that branch, like shown in the attached screenshots.

      I find it very hard to reproduce the exact steps, but in a tutorial I gave yesterday all students experienced this same issue after:

      1. Using Import to clone the remote repository.
      2. Making a change.
      3. Trying to switch branch.

        Attachments

          Activity

            People

            • Assignee:
              kkolipaka Kondal Kolipaka (Inactive)
              Reporter:
              mpmiranda Mauro Parra-Miranda
            • Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated: