Run Merge Tool is disabled in qt creator
-
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 = falseand screenshot of actuall issue is
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
-
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 = falseand screenshot of actuall issue is
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
@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