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

Question

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.

Dave Sky · Answer

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.

Dave Sky · Answer

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?

Manju · Answer

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!