What's the best way to build git work into multiple long-feature branches?

Question

git

Good time of the day!
We have 5 branches:
1. master - here only that 100% works
2. dev - we merge everything here before tests
3. feature1 - this is the first feature branch. Developed for a long time, periodically merged with dev.
4. feature2 - the same
5. feature3 - the same
So here's the trouble: sometimes these branches can affect shared files. If everything is clear with dev and we merge everything into ourselves, occasionally resolving problems, then when we, for example, pour the feature2 branch into dev, and feature1 and feature3 try to merge dev into ourselves, we will rake a bunch of problems.
Question: what is the best way to build a work with git into several long-feature branches?

Answer 1

it's like that.
You periodically rebase features for development, after the feature1->dev merger, feature1 ceases to exist (in theory).
on the rest, you resolve conflicts once and go further.
there is also git rerere, but I haven't used it yet. just read theory.