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: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Will there be a way to fix a merge conflicts within Sourcetree in any future updates?

Chris
Chris
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
January 21, 2021

Right now, I have to pull the conflict to my local machine via terminal, then make the changes with my editor. I am unable to pull the conflict with Sourcetree, nor edit the conflicting file(s).

Answer
Watch
Like Be the first to like this
305 views

0 answers

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

    See all events