The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning
Events
Champions
Release Notes
Community
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning Events Champions Release Notes
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning Events Champions Release Notes

Forums

Articles
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Three way merge when changing branches in git?

Jon Hart1
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?

Watch
Like Be the first to like this
1711 views

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
stevestreeting
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 Champions.
Get recognized
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.

Reply
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

    See all events
    Community
    Forums
    FAQs Forums guidelines
    Learning
    About learning Resources
    Events
    Champions
    Release Notes
    Copyright © 2026 Atlassian
    Privacy Policy Notice at Collection Terms Security