It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

0 votes

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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,935 views 0 12
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you