Git merge conflict

I have a question about the .openzeppelin directory. Our team is using upgradable contracts when we deploy the contracts, json files gets created/updated. But when we check push our source tree to github and pull, it's always generating conflicts. Should we be ignoring the .openzeppelin directory? Thanks!

1 Like

See the documentation on this question: Configuration Files in Version Control