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

After saving conflict with P4Merge, the file cannot be saved. Edited

Hi, I'm MInku.

I use Sourcetree 3.1.1 on MacBook Pro (Mojave 10.14.3) and Bitbucket Cloud.

My team were testing merging/conflict solving using P4Merge (

Rev. P4Merge/MACOSX1013X86_64/2018.2/168776).

Check this video link.

I have saved the change but SourceTree doesn't check my latest file.

Can we solve this together? 


-Kind Regards, Minku

1 answer

0 votes
bgannin Atlassian Team Mar 06, 2019

Hi @mangotamu,

Please file a ticket in our public tracker with the excellent info you provided above and we'll be sure to review and triage for a future update. Thank you for your patience.

Brian Ganninger
Principal Developer, Sourcetree

Suggest an answer

Log in or Sign up to answer
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,970 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