-
`git mergetool` creates files for each conflicting side and merge base.
Example:
- app/views/foobar.html_BASE_17711.slim
- app/views/foobar.html_LOCAL_17711.slim
- app/views/foobar.html_REMOTE_17711.…
-
With my limited knowledge I've been trying to get this package to work with Kaleidoscope 2 for a few days. This is the error I get:
"/usr/local/git/libexec/git-core/git-mergetool--lib: line 119: ksdi…
-
**Problem description**
using sublime merge as a merge-tool using the following configuration:
`mergetool.smerge.trustexitcode=true`
`mergetool.smerge.cmd=smerge mergetool $BASE $LOCAL $REMOTE -o…
-
## Summary
When merging a branch having
- Git LFS tracked files that were changed in both branches (=> merge conflicts) and
- the merge has 2 common ancestors
then the git mergetool will fail, b…
-
i.e. https://medium.com/faun/using-vscode-as-git-mergetool-and-difftool-2e241123abe7 ?
-
Hi, all. We're having a project with four people working on the same notebook, and use nbdime extensively. Every now and then, the mergetool just doesn't work. The page hangs in its loading state: The…
-
For some reason, it's not working on my machines. I've installed the plugin on my private and on my machine at work. Neither works.
Here's my .gitconfig:
```
[diff]
tool = bc3
[difftool]
…
-
コメントでいい感じの設定を書いておく。
-
We've extended gitlab with gvfs protocol and encountered this error during "gvfs clone".
With debug mode of git-credential-manager on, the detailed log is as follows:
> Clone parameters:
Repo…
-
Hi,
I was wondering if neoforged was really supported ? I've seen this commit https://github.com/SKCraft/Launcher/commit/b5fe175650b14dac472bb84a95d15613078a84c0 but it doesn't look like it works o…