Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,368,781
Community Members
 
Community Events
168
Community Groups

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
TAGS

Atlassian Community Events