what is android studio update project vcs

Merge: choose this option to have the merge strategy applied.Simply stash, pull, then apply the stash and it should all be good.Īccording to the IntelliJ IDEA documentation: Update Type Rebasing requires additional work, but since you don't have a merge commit it will essentially make the merge invisible.Īgain, in your case you shouldn't need to merge or rebase. In general, merging is easier, but some believe that it 'pollutes' the git history with merge commits. This StackOverflow post has some great information on the differences. If at some point you committed but didn't push you will need to either rebase or merge. Stashing your changes only works if you only have uncommitted changes.

You should then be able to pull the changes without any issues.Īfter you have successfully pulled, you can do a git stash apply to re-apply the changes you had made prior to the pull.

Before trying to merge anything in, you should stash your changes to save your uncommitted changes and clean your working directory. The key here is that you have uncommitted work that you want to save.

What is android studio update project vcs