Three way merge when changing branches in git?

I got really used to being able to changes branches at will in hg. Now that Im in git I often find myself blocked from changing branches by conflicts with work space modifications. Does sourcetree have an option to do '-m' when checking out?

1 answer

Not right now, your best bet is to stash your changes for the moment. But I'll add this to my list.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

716 views 3 2
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