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! :)
× Create
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for
Community resources
Community resources
Community resources
- Community
- Q&A
- Sourcetree
- Questions
- Merge strategy ours
Merge strategy ours
Robert Altman
March 22, 2021 edited
In one specific work-flow, I need my developers to be able to perform a
git merge -s ours branch-qa
to resolve merge conflicts with branch-qa without changing file on the current branch.
How can I do this within SourceTree?
0 answers
Comments for this post are closed
Community moderators have prevented the ability to post new answers.
Copyright © 2026 Atlassian