It depends -- for simple conflicts, it can be overkill. In some developer environments, a git-aware IDE can provide a more familiar environment for managing conflicts (eg, especially if a build or test process is required after a merge conflict). But, otherwise, for complicated or non-IDE merges, a mergetool can be handy.
It depends -- for simple conflicts, it can be overkill. In some developer environments, a git-aware IDE can provide a more familiar environment for managing conflicts (eg, especially if a build or test process is required after a merge conflict). But, otherwise, for complicated or non-IDE merges, a mergetool can be handy.