Can you help with git flow?

Question

git

I'm trying to understand git flow and I have this question. Let there be a master branch dev. Two developers A and B made their branches from it (from the same commit). Each of them made some changes to their branch, making a certain number of commits. Some changes were made in the same files. A then opened a pull request, which was successfully accepted. What should B do now to get his changes accepted? Just open a pull request or first merge dev into your branch (and how to merge or rebase) or something else?

Answer 1

Both developers, when working on their branches, must keep up-to-date, i.e. periodically merge dev into your branch.
Therefore, before making a pull request, developer B must merge dev into his branch. In the event that conflicts arise, he resolves them within his branch. And only after he makes sure that this branch contains all commits from dev and all tests pass, you can make a pull request to dev.