Skip to content

flutter upgrade ignores local repo changes #6349

Closed

Description

@devoncarew

flutter upgrade ignores git errors when you have conflicting changes locally, and continues the upgrade even though nothing from the remote repo was fetched.

Upgrading Flutter from /Users/devoncarew/projects/flutter...
From https://github.com/flutter/flutter
   93d757c..06babb2  master     -> upstream/master
error: Your local changes to the following files would be overwritten by merge:
    examples/hello_world/hello_world.iml
Please commit your changes or stash them before you can merge.
Aborting
Updating 93d757c..06babb2
Building unlinked bundles for flutter...             3.2s
Building unlinked bundles for flutter_driver...      0.1s

Activity

  1. added
    toolAffects the "flutter" command-line tool. See also t: labels.
    on Oct 16, 2016
  2. bdytx5 commented on Jul 26, 2018

    @bdytx5

    any fix?

  3. added a commit that references this issue on Sep 27, 2018
  4. github-actions commented on Sep 2, 2021

    @github-actions

    This thread has been automatically locked since there has not been any recent activity after it was closed. If you are still experiencing a similar issue, please open a new bug, including the output of flutter doctor -v and a minimal reproduction of the issue.

  5. locked as resolved and limited conversation to collaborators on Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    toolAffects the "flutter" command-line tool. See also t: labels.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions