Conflict Resolution?

[kalevitan]

Thank you for sharing this workflow. I'm surprised there's not a section covering conflict resolution. For us, we create an "integrator" branch off of our feature and merge develop into it in order to handle any conflicts. Any additional feature updates are done from the original feature branch and are pushed via the integrator. Unfortunately, it only resolves the conflicts between the develop branch at that time, which are essentially lost in an attempt to keep the feature branch "clean". Furthermore, there's a high chance the conflicts will have to be resolved again once the feature is ready for master. What are your thoughts on this process and could share some techniques for handling conflicts with this workflow?