Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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,560,579
Community Members
 
Community Events
185
Community Groups

Merge not working with 3rd party app

I am using Araxis Merge as my merge tool but it is not working for the "merge" option.  It is working for the "diff" option though.  When clicking the merge option I can see a dialog appear in sourcetree but it disapears too quickly to see what it says.  Then it looks like it has done some sort of auto merge but it is nothing like it should be.  It used to open the Araxis Merge application.  I have not updated Araxis Merge.  I have selected the application names in my compare options for "compare" and "merge" inside sourcetree.

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events