Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,375 views 4 5
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