Android Studio Update Project: Merge vs Rebase vs Branch Default

Question

Apologies if this seems redundant as I know there are fair amount of questions regarding Merge vs Rebase, but there doesn\'t seem to be any that throw in \'Branch Default\'

Answer 1

I couldn't find the answer to this question (i.e. the work-flow) in any of Google's documents... so here's my practical experience using Android Studio and Git completely from a UI.

(I vomit at the thought of switching between command line and IDE - it means the IDE is lacking!)

1. Stash your changes with: Right Click Project -> Git -> Repository -> Stash Changes. Give it a name.
2. Pull updates that your colleague did with: Right Click Project -> Git -> Repository -> Pull
3. Merge back your code changes with: Right Click Project -> Git -> Repository -> UnStash Changes -> Apply Stash
4. You will then see a "Files Merged with Conflicts" UI. This is where you select a file and selectively merge.

WARNING

The manual merge "Merge Revisions" UI is TERRIBLE. Once you try it, you'll see what I mean. Good luck trying to get "Synchronize Scrolling" to actually work. I sincerely hope this UI is addressed within the first few weeks of 2015.