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

Source tree not showing merge line in history

From some pull requests, the merge line is not visible.

What is the cause of this as it leads to misinterpretation of branch state?

Thanks :)

Screenshot 2019-07-04 at 12.53.53.png

1 answer

0 votes
Mike Corsaro
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Jul 08, 2019

Hello! That's odd -- if you click on the merge commit is one of the parent commits listed the commit below it? It would help if I knew the SHA of both parents and the SHA of both commits.

 

Thanks!

Sorry for the delayed response :D - I forgot I asked the question.

The issue still exists as you can see from the attached screenshot

Screenshot 2020-10-21 at 19.53.35.png

The merge was done using a Pull Request via Bit Bucket.

If I click on the master branch, the commit history doesn't seem to exist, it appears to have squashed it down (default setting from BitBucket)

The 'parents' information is the previous merge onto the master branch.

I'm guessing the issue may be a result of a squashed merged, if it is, is there not a better way of representing this in the UI so it is clear that branch has been closed?

Like # people like this

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events