I am currently on A. I right click B and popup menu shows "Merge B into current branch". B is few commits bellow. Then dialog with "Are you sure you want to merge 'B' into your current branch?". I click OK. Then refresh, with same output. Current branch A and B few commits down. (Not merged to A.)
If you look at the uncommitted changes, do you have some merge conflicts to resolve or just merge results to commit, by any chance? How are the controls set at the top, where you can select what you see ("All branches/Current branch" drop down, plus "Show remote branches" check-box)? In the Confirm merge dialog, do you have the "Create a commit even if..." check-box checked?
I think I have the same issue. We've got a branch, call it Foo. I create a branch off of Foo, called "Bar". I make some changes in Bar. Other people make changes in Foo. I want to merge their changes in Foo into my private branch, Bar. In SourcTree, I see my current (bold) branch is Bar. I right-click Foo, select "Merge Foo into current branch." I know Foo has changes in it that aren't in my branch, Bar. But when I select merge, click okay on the popup, nothing new comes up in my staged files, no merge conflicts, nothing. I think this guy had the same issue, and from what I can tell, got frustrated by nobody understanding his question.
I still think it's a bug. If I click on the graph of branch Foo in the history view, I can select merge.... When I go that route, it works - it pulls the changes from Foo into Bar. But if I right-click the branch in the "Branches" list to the left of the graph, it does as I described above - no changes, no new merge commit in the graph.
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs