hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
From github.com:liballeg/allegro5
 * branch                master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
	android/gradle_project/allegro/build.gradle
	android/gradle_project/build.gradle
	android/gradle_project/gradle/wrapper/gradle-wrapper.properties
Please commit your changes or stash them before you merge.
Aborting
Updating 80db7b5f4..5c38df383