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,456,616
Community Members
 
Community Events
176
Community Groups

Can I use an external diff engine to compare files in bitbucket scm?

Edited

The built-in diff engine in BitBucket is atrocious at aligning code in the side-by-side comparison.

If I add a function in say at line 124, pushing the existing function down 10 lines to line 134, BitBucket will align the existing function to the new function at 124, even though there is an exact match to the original function 10 lines lower.

It prefers matching:
    func GetConfigFileFromS3(key string) (*model.RevConfig, error) { 
to:
     func GetDefaultConfigFileFromS3(ItemName string) (*model.RevConfig, error) {

 

Its like it chooses a poor match here and can't even scan 10 lines further for an exact match.

Using BeyondCompare I can set the look ahead to 100s of lines so it will align properly even if I'm inserting large blocks of new code.

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events