V
V
Vova2016-10-13 15:01:22
git
Vova, 2016-10-13 15:01:22

The right tool for merge?

Hello. Whenever I try to merge something with git and resolve conflicts, I see something like:
https://s.mail.ru/4oGk/orW6Afd27
That is, TortoiseGitMerge shows me about 5 identical pieces of code . Of these, 3 are exactly the same.
Question: is there a more suitable tool that will not waste my brain once again and show everything somehow more compactly and understandably?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
Олег Гамега, 2016-10-13
@gadfi

я использую строенные инструменты от jetbrains (пишу в AndoidStudio но это детали, они одинаковые для всех) лучше инструмента не видел

H
hetzerok, 2016-10-13
@hetzerok

На вкус и цвет. Мне приглянулась вот эта прогаhttps://www.perforce.com/product/components/perfor...

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question