The GUI client for developers to inspect resolved conflicts and manually resolve remained conflicts, after merging branches with IntelliMerge.
- Windows (Linux/macOS will be supported really soon)
- Git ^2.18.0
-
Download the binary software from the release page, for example, the exe file;
-
Config the software as the
mergetoolof Git, there are two ways to do it:
- Config with commands in terminal:
git config --global merge.tool intellimerge
git config --global mergetool.prompt false
git config --global mergetool.intellimerge.cmd '"[PATH]/IntelliMerge-UI.exe" "$LOCAL" "$REMOTE" "$BASE" -o "$MERGED"'
git config --global mergetool.intellimerge.trustexitcode true- Config by appending the following content at the end of
~/.gitconfig:
[merge]
tool = intellimerge
conflictstyle = diff3
[mergetool "intellimerge"]
path = [PATH]/IntelliMerge-UI.exe
cmd = [PATH]/IntelliMerge-UI.exe "$LOCAL" "$BASE" "$REMOTE" -o "$MERGED"
trustExitCode = falseReplace the [PATH] with the full path of the downloade binary software.
- Under a Git repo with merge conflicts, run the following command in terminal:
git mergetool- Windows/Linux/macOS
- Git ^2.18.0
- Node.js ^v10.16.0
- Yarn ~v1.16.0
- Vue-cli ~v3.8.4
- Run the following command under the root directory of the cloned repo to install dependencies:
yarn
- Compiles and hot-reloads for development:
yarn run electron:serve
- [OR] Build the executable for production:
yarn run electron:build
- Write your code now!
yarn run lint
![dependabot[bot] avatar](https://avatars.githubusercontent.com/in/29110?v=4 "dependabot[bot]")
![mend-bolt-for-github[bot] avatar](https://avatars.githubusercontent.com/in/16809?v=4 "mend-bolt-for-github[bot]")
React
Typescript
Django
Laravel
Facebook
Microsoft
Google
Alibaba
D3
Tencent