Or even just "the branch you're on" and "the branch being merged into yours"