Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Three way merge when changing branches in git?

Jon Hart October 20, 2011

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

0 votes
stevestreeting
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
October 20, 2011

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
TAGS
AUG Leaders

Atlassian Community Events