Hi All,
I hope everyone is doing well and thank you so much for your help.
I have the following situation and I’d like to know the best practice for handling it.
Currently our we use GitFlow as branching model and during a bug we create hotfix branch.
We create short-lived hotfix branch from the main(production) branch for critical fixes. Once the fix is complete, We merge the hotfix into both main and develop, and then delete the hotfix branch. This ensures the fix is delivered to production and carried forward into development.
The issue is that during the hotfix process we manually bump the version of the manifest file. As a result, we almost always get merge conflicts on that file when merging the hotfix back into develop.
those are the manifest files we have one per env Dev.appxmanifest.xml, Stage.appxmanifest.xml, Prod.appxmanifest.xml
I was wondering what’s the recommended way to handle version bumps in this workflow to avoid repeated merge conflicts?