repo sync error "branch is published but not merged

[Nathanael Robbins (Nate)]

I made a change in frameworks/native, uploaded the change to Gerrit, and then abandoned the change. I then later made a commit to the local branch associated with this commit.

When I `repo sync`, I get this error:

Repo command failed due to the following `SyncError` errors:
branch branchname is published (but not merged) and is now 16 commits behind

This is fixable by simply using `repo rebase`. Is there a way to make this the default behavior and not need to run an additional command each sync? From what I understand, repo always rebases by default when your changes are on a separate branch, but this only appears because I've uploaded the change to Gerrit.