Every time we commit, we encounter merge conflicts with "vendorlib-sbom.json". This situation is quite frustrating, as resolving these conflicts requires the use of an IDE (we use Visual Studio) and an external Git client (our choice is GitHub Desktop). While this is annoying for us, I can imagine that for those without experience in Git, it could be a significant obstacle. Does anyone have any suggestions for a permanent solution to avoid manually fixing the JSON file each time? It could be an option to add "vendorlib-sbom.json" to .gitignore, but I don't know if this has any unwanted consequences.
↧