Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
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

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,460,383
Community Members
 
Community Events
176
Community Groups

Cannot abort external conflict merges - file is always marked as resolved

Edited
Ben Capewell
Ben Capewell Jun 06, 2017

I'm using SourceTree for Windows v2.1.2.3.

I'm unable to abort merges launched in an external merge tool - even after I've clicked abort in the modal dialogue opened by SourceTree, when I close the external merge tool (without saving the tmp file), SourceTree marks the conflicted file as resolved.

I'm using WinMerge as a custom merge tool, with the command "C:\Program Files (x86)\WinMerge\WinMergeU.exe" and argument "$MERGED" to make use of WinMerge's conflict file merge facility.

 

Comment
Watch
Like Be the first to like this
575 views

0 comments

Comment

Log in or Sign up to comment
Sourcetree
Sourcetree
TAGS

Atlassian Community Events

See all events