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,559,151
Community Members
 
Community Events
184
Community Groups

Why does sourcetree show a single branch after a merge?

Michael Schamber
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
May 17, 2023

I'm new to git and sourcetree, and I recently encountered an issue where there is no merge commit and all my branches are collapsed after I merged develop into main (first merge was the UPDATE:increment version to 1.0.0 commit). No matter what branch I switch to, it always displays as a single line. If I make changes to a single branch, it doesn't represent them graphically as distinct branches. This can be seen below:

Screenshot 2023-05-17 at 8.52.03 AM.png

 

But in another repo, everything functions as normal:Screenshot 2023-05-17 at 8.58.06 AM.png

 

Has anyone encountered this before? I tried to search for a solution or cause, but didn't see anything. The only thing that stands out to me is that one is showing a remote HEAD while the other does not.

Thanks for the help!

1 answer

1 accepted

0 votes
Answer accepted
Michael Schamber
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
May 17, 2023

Managed to solve the issue. 
I'm not sure why, but the one repo was merging via fast-forward so it was not creating a commit.

After performing a hard reset of the main branch to the initial commit, I selected "create a commit even if merge resolved via fast-forward" and now the branches and merge commit are present. 


Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events