-
Under Preferences -> Integration we can already configure UnityYAMLMerge as our Merge Tool.
Now the UnityYAMLMerge specific config file **mergespecfile.txt** defines which mergetool will be used a…
-
Provide a compare and merge tool to merge two versions of a repertoire
pasbi updated
8 years ago
-
### Describe the problem
When running `copier update` with inline conflict markers, if there is a conflict the file in the worktree will have conflict markers as expected, `git status` will report th…
-
Hey,
Sorry that I create an Issue for this, but I didn't found a better way of contact to send you some feedback and feature suggestion I would really love in your software.
I really love your s…
-
Update docs for use of vimdiff. Provide docs for configuring other dfftools/mergetools:
- Using VSCode: https://stackoverflow.com/questions/44549733/
- Use IntelliJ or WebStorm: https://coderwall.…
-
where to add? probably should stick to the rules, and add it to `JGit` as a method.
```
JGit.mergetool
```
Can move the `writeConflictFiles` functions in `pull` and `merge` to `mergetool`. Need to s…
-
In short - how to get merge-confilcts to be the default conflict resolution app?
-
I realized you already mention this possibility in https://github.com/jjlee/git-meld-index?tab=readme-ov-file#ideas , but I wanted to mention that I'm excited for this idea. In my mind, it's fine if o…
-
Hi! Thanks for this great tool!
I've tried to configure it as a Git mergetool:
```
git config --global merge.tool fac
```
However, Git ignores it and it runs `vimdiff` for me. Previously, I…
-
I use VS Code as my mergetool and have become a fan of the diff3 conflict style (https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git), since it allows me to resol…