Text message by Brian Casel

Hey sir -

It seems our articles and assets folder is the source of all of the git conflicts, every time we push to production.  I have to SSH to resolve it almost every time.

the main culprit are the images we put in articles.  Always git conflicts in the yml for these images.

I'm wondering if it would make sense to add some folders to gitignore.  Do you see any potential issues with this?

Here's what I'm thinking should be ignored:

public/assets/article-images (this is where we're storing article images)

content/collections/articles
content/collections/blog-categories
content/collections/blog-tags
content/collections/blogs
content/collections/categories
content/collections/tags