Search code examples
javaeclipsegitgit-merge-conflict

Which is the recommended way to merge conflicts in git is it through and IDE or some open Source Application?

  1. How do I merge conflicting classes in git?

  2. Is it recommended to merge conflicts in an IDE such as Eclipse or use something like Git Bash?

An Example to merge two conflicting classes with commands will be very helpful

Solution

  • Hello @briantaurostack7!

    I don't like the way how eclipse deal with git conflicts. I recommend in this case an use of a tool that can handle this conflicts.

    If you use Windows i recommend source tree:

    https://www.sourcetreeapp.com/

    or git kraken for(Windows, Linux, MAC):

    https://www.gitkraken.com/

    Git Kraken comes with a lot of cool configuration options, where you can configure a tool for merge conflicts. At this point, you can use KDiff tool or beyond compare.

    If any conflicts are detected on merge step, git kraken automatically list all conflicts for you and with one click, you can open the conflict on your merge editor and solve it. :)