nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

SourceTree supported merge tools for resolving conflicts

Ray Lee_n349iz

Hi,

May I know if any recommended merge tool can be easily integrated with SourceTree to resolve conflicts just like that in eclipse ? As I try to use beyond compare with SourceTree and it looks the operation is not easy and mistake would be result at the end.

Thanks,

Ray

Accepted answers

All comments

There are no accepted answers yet

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Unanswered
Groups
Help

Find more posts tagged with

sourcetree

conflict