We have a develop branch.
Every new feature gets created on a branch that runs off the develop branch.
Then a pull request is made to the develop branch.
This triggers our CI/CD and slowly but surely makes it way to the master branch and deployed live after all the quality checks and tests are validated.
Here's our issue:
Developer1 creates a branch off develop for feature 1.
Developer 2 creates a branch off develop for feature 2.
Then, developer1 creates a pull request that includes an updated
His PR gets approved and merged.
Then, developer2 tries to do a pull request to the develop branch but there's a conflict, because the
composer.lockwere modified on the develop branch by developer1.
What's the best way to go about this?
Should developer2 first merge the develop branch back into his feature2 branch?
Or is there a better way of managing composer introduced merge conflicts?