Merge Tool

Git merge tool

Table of Contents

• Usage
• Installation
  • Linux
  • MacOS
  • Windows
• Uninstall
  • Linux
  • MacOS
  • Windows
• Why need Merge Tool?
  • See More...
• CLI completions (macOS only)
  • How to setup Amazon Q Autocomplete for MergeTool

Usage

MergeTool {branch}
MergeTool {branch} --push

Or you can use the alias:

gmi {branch}
gmip {branch}

Installation

Linux

bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/install-linux.sh)"

MacOS

bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/install-osx.sh)"

Windows

Open PowerShell as Administrator and run the following command:

powershell -command "& {Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/install.ps1'))}"

Uninstall

Linux

bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/uninstall.sh)"

MacOS

bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/uninstall.sh)"

Windows

powershell -command "& {Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/iml885203/DotnetMergeTool/main/tools/uninstall.ps1'))}"

Why need Merge Tool?

Merge Tool is more user-friendly and has a better error handling mechanism.

It will checkout back to your original branch when an error occurs.

See More...

CLI completions (macOS only)

How to setup Amazon Q Autocomplete for MergeTool