It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

0 votes
Manju Atlassian Team 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?

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.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,927 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you