Our developers have a custom driver for git installed
git config --global merge.ours.driver true
This is used to allow us to ignore certain folders on when we merge from one branch to another.
We then include in our .gitattributes file:
**/Migrations/* merge=ours
**/MigrationsSql/* merge=ours
This works locally for our developers, however, we have since realized that when we run Pull Requests on DevOps and we hit the "Complete" button, because the driver we created on the developer machines is not on DevOps, these migration folders we were hoping to ignore would get merged too.
I have looked through the settings on DevOps and can't see any way to update the git config files there, so we can add this driver.
Does anyone know how\if I can update Azure DevOps git config to add this driver?
No. You can't.
In general, if you don't want something to be managed by source control, don't put it in source control. Use a .gitignore to exclude it entirely.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With