Are you in the loop? Keep up with the latest by making sure you're subscribed to Community Announcements. Just click Watch and select Articles.

×
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

Right-click Merge... does nothing (Mac)

I'm on a branch (no current changes) and trying to merge our develop branch into it; when I right-click develop then "Merge...", nothing happens.

Sometimes it works and shows the box to merge.

I can't tell what's happening or why it doesn't work. If I run `git merge develop` command in Terminal, it fast-forwards or merges as expected.

What is going on with SourceTree? The branch is on a commit with other branches, so is SourceTree choking because it was never programmed to let me choose which branch to merge? This seems like a bug or design flaw. I just updated to the latest.

2 answers

Happened again... I closed SourceTree and re-opened it, doesn't fix it.

What am I supposed to do?

I can only merge another way when this happens, like using Terminal git command.

It seems to happen only when a fast-forward can't happen.

0 votes
Manju
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Jan 08, 2020

Hi, 

Not sure I get this completely. Things are working fine for me. Alternately, if you are on the branch you want to merge into, you can use the Merge toolbar icon and select the source and that works as well. If you think there is a bug, please feel free to submit a ticket on https://jira.atlassian.com/browse/SRCTREE with a short screen recording if this isn't working for you for us to look into. 

 

Thanks!

Well it works for me too... until it randomly doesn't work.

I'll try the Merge button next time.

What do I use to record the screen?

Also how do I blur out certain parts of the screen or video so proprietary info isn't shown?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events