# quan @ quandeMacBook-Pro in ~/Desktop/10-01/app_addressing----quan on git:1.0.1.Release o [10:02:27]

$ git pull                                                                                                                                    (git)-[1.0.1.Release|rebase]-

remote: Enumerating objects: 19, done.

remote: Counting objects: 100% (19/19), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 10 (delta 4), reused 10 (delta 4), pack-reused 0

Unpacking objects: 100% (10/10), done.

From https://github.com/quanbetter/app_addressing

   b545860..43735b6  1.0.1.Release -> origin/1.0.1.Release

Updating b545860..43735b6

error: Your local changes to the following files would be overwritten by merge:

        addressing-web/src/main/java/com/quan/addressing/AddressingWebApplication.java

Please commit your changes or stash them before you merge.

Aborting