Three way merge when changing branches in git?

[Jon Hart]

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?

[stevestreeting]

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