This is a problem I've encountered a few times and am curious what the right course of action is. I'm sure it's been asked before but I can't find the right language for the title.
I have a large feature branch checked out, that is still being reviewed, we'll call it branch A
I'm working on a smaller feature on branch B, but it's actually dependent on code that's in branch A
If I just merge branch A into branch B, I'll eventually have tons of conflicts when I go to merge branch B into master, because it will also have all of the changes from branch A
Assuming I can't just merge branch A into master before pulling it and then working on branch B, what's one to do in this situation?