GitLive 18.0: Merge conflict detection now flags conflicting changes in the Repository View
Eliminate the stress of merge conflicts and check if the changes you are making on your own branch conflict with any other branch, anytime, directly in your IDE.