When working on tracking code changes pulled from an Avo branch it's not clear how to proceed with merging the git branch and the Avo branch. There are two ways to proceed:

1/ Merge the git branch before the Avo branch. Now avo.json on git master points to the Avo branch instead of Avo master (which is ok, but very confusing).

2/ Merge the Avo branch before the git branch. In this case I need to pull Avo again after merging the Avo branch to have avo.json pointing to Avo master.

I'd love if Avo could take care of merging my Avo branch automatically when I merge my tracking code changes on git.