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

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,556,448
Community Members
 
Community Events
184
Community Groups

Not able to merge branches in 2.4.8.0

Hello,

I've got a strange problem. I am trying to merge a branch into my current branch, but sourcetree does nothing.

I see message "Do you want to merge 'zzz' into your current branch", press OK.

I can see the merge window flash for a second and disappear.

But there are no changes in the working copy and no merge is actually done.

Anybody else with this problem?

1 answer

0 votes
Mike Corsaro
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Mar 28, 2018

Hello!

If you've right-clicked on a branch and merged it, the merge will automatically commit immediately if there are not any conflicts. If you do not want this to happen: use the "Merge" button in the toolbar which will bring up a more advanced dialog that will give you more options such as the ability to disable this behavior.

I think you've misunderstood the problem because I have the same issue. I do the merge and see the same thing Dmitri does and no new commit is created

Like Izzy likes this

I've experienced this multiple times also. Whether using the merge button or right clicking. Nothing ends up happening.

Like Izzy likes this

How did you solve the problem? Because I have the exact same problem...

I can't remember, unfortunately. But I suspect I either...

  • Used the terminal to do the merge (look up git merge)

Or

  • Used GitHub Desktop. This is git's own program like SourceTree. It's possible the free version doesn't allow merges, but I can't remember. If this works, it would probably be the easiest option for you if you're not comfortable with terminal.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events