4 ms·
we need something like this in lazygit -- which is excellent all around but lacking in visual diffing/merging. What is most useful though is a 3-panel setup, l
by insane_dreamer 8mo ago
we need something like this in lazygit -- which is excellent all around but lacking in visual diffing/merging.
What is most useful though is a 3-panel setup, like JetBrains -- still the best git client I have worked with.
- flamestro 8mo agoWhat would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?
- insane_dreamer 8mo agoyes, it shows the final merge (what was accepted from the left and right panels); very handy
- lolive 8mo agounfortunately for terminal lovers, the best .gitconfig snippet is still this: [diff] tool = intellij [difftool "intellij"] cmd = idea diff \"$LOCAL\" \"$REMOTE\" [merge] tool = intellij [mergetool "intellij"] cmd = idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" trustExitCode = true