How context menu option "Merge {branch} into current branch" is working?

[n99]

I expect to move "selected" branch into current branch, but nothing happens. Or is it a bug? (I am using the currently latest SourceTree 1.6.4.)

[Balázs Szakmáry · Accepted solution]

If nothing happens, your branch is probably up-to-date with the one you are merging into it.

[n99]

That's obvious, but it is not true in my case. Is it working for you? What version are you using?

[Balázs Szakmáry]

1.6.8. Are you sure you were merging the right branch into the right other branch? (Sorry if this is trivial: the target branch you are merging to is the one you have checked out and the source branch you are merging into the target is the one you select.)

[n99]

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.)

[Balázs Szakmáry]

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?

[Seth]

Balazs was right in his first comment, it sounds like you are trying to merge in the wrong direction. If you want branch B to change, you meed to merge branch A into branch B.

[James]

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.

[Seth]

If there are no merge conflicts, then the merge gets committed automatically. That means your repo should remain clean (no staged or uncommitted files), but you should see a new merge commit in the graph.

[James]

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.

[Seth]

That does sound like a bug. The best place to post bug reports is at jira.atlassian.com. Few of the users on Answers are Atlassian employees.