We have a regular (short-lived feature branches) git flow with one main branch and feature branches going in and out of main. When there are are commits in main not in my feature branch, I merge main into my feature branch (and create a merge commit).