title: Pulling down latest code from github to Android Studio
body: <p>How to <code>sync</code> my local <em>Android Studio</em> project with the latest code on <code>github</code>?<br>
  I want to download all the latest changes <strong>but I don't want my local changes overwritten</strong>.<br>
  If there is a conflict, it should ask me to resolve those particular files.<br>
  Is there a way to achieve this? </p>