Author Topic: vsmerge as Git mergetool  (Read 1005 times)

Juan Fonseca

  • Community Member
  • Posts: 33
  • Hero Points: 1
vsmerge as Git mergetool
« on: May 03, 2018, 03:12:11 pm »
I tried to use vsmerge as the mergetool in Git but it didn't work correctly. It launched and I was able to resolve conflicts but the merged file still had the conflicts with the lines that Git inserts. Has anyone tried this? Below is the text in my .gitconfig.

[merge]
     tool = vsmerge
 [mergetool "vsmerge"]
    cmd = /home/vagrant/slickedit-pro/bin/vsmerge -smart $BASE $LOCAL $REMOTE $MERGED
    keepBackup = false

Thank you.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2389
  • Hero Points: 133
Re: vsmerge as Git mergetool
« Reply #1 on: May 03, 2018, 03:51:03 pm »
I will have to look into this.

Juan Fonseca

  • Community Member
  • Posts: 33
  • Hero Points: 1
Re: vsmerge as Git mergetool
« Reply #2 on: May 03, 2018, 07:57:33 pm »
Thank you.

PiezonTM

  • Senior Community Member
  • Posts: 123
  • Hero Points: 7
Re: vsmerge as Git mergetool
« Reply #3 on: May 04, 2018, 12:34:16 pm »
I have used this in the past:
Code: [Select]
[diff]
    tool=vsdiff

[merge]
    tool=vsmerge

[difftool "vsdiff"]
    cmd = /opt/slickedit-pro2017/bin/vsdiff "-r1" "$LOCAL" "$REMOTE"

[mergetool "vsmerge"]
    cmd = /opt/slickedit-pro2017/bin/vsmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

Hope this helps.

Juan Fonseca

  • Community Member
  • Posts: 33
  • Hero Points: 1
Re: vsmerge as Git mergetool
« Reply #4 on: May 04, 2018, 07:58:03 pm »
I'll try that. Thank you.

I failed to mention before that vsdiff works everytime.