Giter VIP home page Giter VIP logo

intellimerge-ui's Introduction

IntelliMerge-UI

The GUI client for developers to inspect resolved conflicts and manually resolve remained conflicts, after merging branches with IntelliMerge.

Screenshots

Light theme:

light

Dark theme:

dark

As a User

Requirements

  • Windows (Linux/macOS will be supported really soon)
  • Git ^2.18.0

Setup

  1. Download the binary software from the release page, for example, the exe file;

  2. Config the software as the mergetool of 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 = false

Replace the [PATH] with the full path of the downloade binary software.

  1. Under a Git repo with merge conflicts, run the following command in terminal:
git mergetool

As a Developer

Requirements

  • Windows/Linux/macOS
  • Git ^2.18.0
  • Node.js ^v10.16.0
  • Yarn ~v1.16.0
  • Vue-cli ~v3.8.4

Setup

  1. Run the following command under the root directory of the cloned repo to install dependencies:
yarn
  1. Compiles and hot-reloads for development:
yarn run electron:serve
  1. [OR] Build the executable for production:
yarn run electron:build
  1. Write your code now!

Lints and fixes files

yarn run lint

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.