resolve conflicts automatically

[jpea]

Hi! I would like to know if theres a way to resolve conflicts in some folders without the user's intervention. A program is modifying some meta data and they have a conflict every time they try to pull. The problem is that this metadata should be tracked but they don't have to commit. I would like to discard this metas when theres a conflict in the pull without notice to the user. How can I do it?

Thanks for your help.

[bgannin]

There's not a way to do so with Sourcetree but I suspect you could write a hook that does this. That's where I would look to first. Here's a potentially good start.