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

According to documentation:

Merge: select this option to perform merge during the update. This is equivalent to running
git fetch and then git merge, or git pull --no-rebase.

Rebase: select this option to perform rebase during the update. This is equivalent to running
git fetch and then git rebase, or `git pull --rebase (all local commits will be put on top of the updated upstream head).

Branch Default: select this option if you want to apply different update strategies for different branches. You can specify the default update type for each branch in the branch. section of the .git/config configuration file.

Merge vs Rebase

Read more here