Resolve git conflict using meld

Resolve git conflict using meld

• Install meld in windows
• Configure meld in your pc
  • Edit gitconfig file in C:\Users<username>\
  • Add following line in the gitconfig file ```text [diff] tool = meld [difftool “meld”]
    path = C:/Program Files (x86)/Meld/Meld.exe
    [difftool] prompt = false

  ```

• Now check and resolve conflict using the following command

  $ git difftool origin/master
  

Refereces

• Git Tutorial 7: Diff and Merge using meld 2019