Geek Answers Handbook

How to combine like git mergetool to show conflict, not differences?

When I use meld as a git mergetool to resolve a merge conflict, meld shows me the differences between local / output and remote / output files (blue or green) that git automatically resolves, and not just the actual conflicts (highlighted in red). And when I fix the down arrow, it moves to the next (blue / green) difference, and not to the next conflict (red). This topic shows this image.

How can you: - ignore a difference that does not conflict - or get into the next conflict (for example, in kdiff3) without stopping at the differences ??

+9
git meld
source share
2 answers

In the meld field, you can click on Changes> Merge All, which will merge most changes except conflicts.

+6
source share

Add the following to .gitconfig :

 [mergetool "meld"] cmd = meld --auto-merge "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"

This is the same command that Git runs by default with the specified --auto-merge so that Meld will automatically resolve everything it could.

+1
source share

More articles:


All Articles