WIP: chore(prometheus): impose downstream .gitignore in case of conflicts to ensure keeping track of the generated UI assets

[machine424]

No description provided.

[jan--f]

hmm do we not want to manually resolve conflicts like this? If we always restore this on conflicts we might miss additions we might want.
Wouldn't it be better to adjust our assets generation and perhaps fix our gitignore so that it doesn't cause a conflict?

[machine424]

hmm do we not want to manually resolve conflicts like this? If we always restore this on conflicts we might miss additions we might want. Wouldn't it be better to adjust our assets generation and perhaps fix our gitignore so that it doesn't cause a conflict?

Yep, the gitignore will be adjusted as part of openshift/prometheus#227

The suggestion here (still a WIP, not sure if we want to go with it) is just to avoid having to address conflicts for cosmetic upstream changes, if the override doesn't work and human intervention is needed, something should be broken somewhere and we'll be aware of that (CI not passing e.g.)

But yes, we can do without this.