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

For those who are looking for rebase in Android Studio.

VCS > Git > Rebase.

Then click "Rebase", "Start Rebasing", "Merge". To simplify a process click "All" to resolve non-conflicting changes.

There may be conflicting changes, resolve them until you get a message:

If you encounter these conflicts, click left or right arrow to accept the most suitable:

Click a cross over unneccessary change to ingnore or an arrow to accept:

If you accept both changes, you can also edit the resulting code, for instance, add missing } in methods.

Do this until all conflicts get resolved:

Click "Apply". When all files inside one commit will be up-to-date, click "Continue rebasing" to move to the next commit.