Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • Users
  • Groups
  • Search
  • Get Qt Extensions
  • Unsolved
Collapse
Brand Logo
  1. Home
  2. Qt Development
  3. Qt Creator and other tools
  4. Run Merge Tool is disabled in qt creator
Forum Updated to NodeBB v4.3 + New Features

Run Merge Tool is disabled in qt creator

Scheduled Pinned Locked Moved Unsolved Qt Creator and other tools
2 Posts 2 Posters 1.1k Views
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • P Offline
    P Offline
    PranaliTsys
    wrote on last edited by
    #1

    Hi , I have issue in enabling meld merge tool for merging branch on qt. I configured git on qt but if I tried to merge two branches by right clicking on branch the option run merge tool is disabled . my gitconfig file is configured with meld as below

    [merge]
    tool = meld
    [mergetool "meld"]
    path = C:\Program Files\Meld\Meld.exe
    cmd = "C:\Program Files (x86)\Meld\Meld.exe" --label "LOCAL>BASE<REMOTE" --auto-merge "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
    keepBackup = false
    [diff]
    tool = meld
    [difftool "meld"]
    path = C:\Program Files\Meld\Meld.exe
    cmd = "C:\Program Files (x86)\Meld\Meld.exe" --label "LOCAL|REMOTE" "$REMOTE" "$LOCAL"
    keepBackup = false
    [difftool]
    prompt = false
    [mergetool]
    prompt = false

    and screenshot of actuall issue is d9f9017a-1cba-4e0d-b45d-0064520316ed-image.png

    I am able to do other all operation with git but could anyone help me in finding how to enable this "Run Merge Tool " from conflict dialg

    J.HilkJ 1 Reply Last reply
    0
    • P PranaliTsys

      Hi , I have issue in enabling meld merge tool for merging branch on qt. I configured git on qt but if I tried to merge two branches by right clicking on branch the option run merge tool is disabled . my gitconfig file is configured with meld as below

      [merge]
      tool = meld
      [mergetool "meld"]
      path = C:\Program Files\Meld\Meld.exe
      cmd = "C:\Program Files (x86)\Meld\Meld.exe" --label "LOCAL>BASE<REMOTE" --auto-merge "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
      keepBackup = false
      [diff]
      tool = meld
      [difftool "meld"]
      path = C:\Program Files\Meld\Meld.exe
      cmd = "C:\Program Files (x86)\Meld\Meld.exe" --label "LOCAL|REMOTE" "$REMOTE" "$LOCAL"
      keepBackup = false
      [difftool]
      prompt = false
      [mergetool]
      prompt = false

      and screenshot of actuall issue is d9f9017a-1cba-4e0d-b45d-0064520316ed-image.png

      I am able to do other all operation with git but could anyone help me in finding how to enable this "Run Merge Tool " from conflict dialg

      J.HilkJ Offline
      J.HilkJ Offline
      J.Hilk
      Moderators
      wrote on last edited by
      #2

      @PranaliTsys
      Because there is no merge tool registered in QtCreator, you're supposed to do it by hand :D, IIRC, took me a while to figure that one out myself.

      • Click ignore.
      • Open the conflicting files
      • make the appropriate changes
      • After saving the changed/merged file, select Tools->gitCurrentFile->SomethingSomethingStageConfictedFileOrSimilar
      • repeat for all other files
      • commit

      Be aware of the Qt Code of Conduct, when posting : https://forum.qt.io/topic/113070/qt-code-of-conduct


      Q: What's that?
      A: It's blue light.
      Q: What does it do?
      A: It turns blue.

      1 Reply Last reply
      2

      • Login

      • Login or register to search.
      • First post
        Last post
      0
      • Categories
      • Recent
      • Tags
      • Popular
      • Users
      • Groups
      • Search
      • Get Qt Extensions
      • Unsolved