git - Merging strategy for overlapping changes

Question

Below is our current work flow, because we are a small team of three developers:

---

feature branch 1 & 2 are going good, because these code changes are not overlapping.

Third developer created feature branch 3(without notice), from master branch, instead of creating from feature branch2, but these are overlapping changes with feature branch1

How do we deal with this?

question from:https://stackoverflow.com/questions/65829109/merging-strategy-for-overlapping-changes

Answer 1

Waitting for answers