Hello,
I apologize if this is a duplicate post, but I couldn't find an answer on the forum.
I'm not new to Bitbucket, but there's something I don't understand.
I work with another developer, and we follow this branching strategy:
To modify these branches, we create feature branches and merge them into development via pull requests.
Master is only updated by merging development into it (which makes sense, as we want to test our changes on staging before deploying them to production).
The issue is that almost every time we merge development into master, we encounter merge conflicts. This is something we want to avoid, as master should be an exact copy of development at the time of merging.
Do you have any idea why this is happening?
Thank you very much for your time and help!
Maxime
