Consider three branches:
-
master
-
feature
- sub-feature
If due to some changes in
master
, a conflict arises infeature
, the same conflict will also reflect insub-feature
.Do this to retain the commit history of
feature
insub-feature
for seamless branching.