resolve conflicts automatically

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.

1 answer

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.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

649 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you