Ok, I have branch feature/12
, it's more or less done, so I branch off it and start working on
feature/13
, which depends on feature/12
.
Code review happens and a few small changes are made to feature/12
. So I apply those changes, then squash against master
into a single feature commit, as is protocol in the company (git rebase -i master
).
Now back to feature/13
, how do I consolidate feature/13
's history so there are no history conflicts against feature/12
and master
? Do I simply git rebase
feature/12` and fix any conflicts?