Sourcetree rebase without a commit

I want to merge a branch but have it appear as 1 commit, without the other branch showing in master. 

 

Right now, I can do a merge and uncheck(commit immediately and check commit even if FF).. This lets me have the commits in my working copy and allows me to create a new commit in master with my changes. But the history still shows the commit on the other branches even after deleting. 

I want to do this, but not show the commits from the other branch, so I can keep committing all I want on separate branches but have this be nice and pretty on my master.

 

Can this be done?

1 answer

I think this will be helpful.

Thanks, I tried a interactive rebase with sourcetree and squashed my commits but I noticed a file had some wrong changes included, so I didn't fully trust it. Maybe doing it in command line will give me different results.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

274 views 0 3
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot