Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

alm does not work when external diff/mergetool for git configured

See original GitHub issue

I have defined external diff and merge tools in my .gitconfig. Everytime I open alm it automatically opens my mergetool several times and I cannot work in the editor anymore. When deleting the configuration from .gitconfig alm works fine again.

[merge]
    tool = extMerge
[mergetool "extMerge"]
    cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
    trustExitCode = false
[diff]
    external = extDiff
[difftool "sourcetree"]
    cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
    path = 
[mergetool "sourcetree"]
    cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
    trustExitCode = true

Issue Analytics

State:
Created 7 years ago
Comments:5 (3 by maintainers)

Top GitHub Comments

1reaction

htammencommented, Jul 24, 2016

Thx, works fine now. Congratulations for this great typescript editor. Even though I’m using IntelliJ Idea for my larger projects I will give alm a try for smaller projects in the future.

0reactions

basaratcommented, Jul 23, 2016

The connection missing in my brain was opening alm vs. opening any file in alm 😃