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).
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.