Search code examples
gitmeld

Meld tool on Ubuntu how to view 2 screens during gitmerge


I have installed Meld tool on Ubuntu and want to use during conflict resolution with gitmerge command.

The problem I'm facing is that it shows 3 windows and it is quite confusing compared to 2 windows.

Any suggestion how to fix this ?


Solution

  • git config merge.conflictstyle merge
    

    This should set the conflict resolution style to 2-file merge instead of 3-file diff3 which is what you're seeing.

    https://git-scm.com/docs/git-merge#git-merge-mergeconflictStyle