An open API service indexing awesome lists of open source software.

https://github.com/iml885203/py-git-merge-into

Git merge into commands
https://github.com/iml885203/py-git-merge-into

cli command-line git python python3

Last synced: about 2 months ago
JSON representation

Git merge into commands

Awesome Lists containing this project

README

          

# Git Merge Into

> Useful command, Colorful result!!!
>
> If you find windows version, check [Merge Tool](https://github.com/iml885203/DotnetMergeTool)

## Table of Contents

- [Usage](#usage)
- [Example](#example)
* [Success](#success)
* [Error Handle - Uncommitted changes](#error-handle---uncommitted-changes)
* [Error Handle - Merge conflict](#error-handle---merge-conflict)
- [Installation](#installation)
- [Uninstall](#uninstall)
- [Development](#development)
* [Install packages](#install-packages)
* [Run](#run)
* [Build](#build)
* [Install Locally](#install-locally)

## Usage
- gmi {branch}: current branch merge into {branch}
- gmip {branch}: current branch merge into {branch} and push

```bash
gmi {branch}
gmip {branch}
```

## Example

### Success

![](./readme/success.png)

### Error Handle - Uncommitted changes

![](./readme/uncommitted-changes.png)

### Error Handle - Merge conflict

![](./readme/merge-conflict.png)

## Installation

```bash
bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/git-merge-into/main/install.sh)"
```

## Uninstall

```bash
bash -c "$(curl -fsSL https://raw.githubusercontent.com/iml885203/git-merge-into/main/uninstall.sh)"
```

## Development

```
git clone git@github.com:iml885203/py-git-merge-into.git
```

### Install packages
```bash
pip install -r requirements.txt
```

### Run
```bash
python gmi.py {branch}
python gmip.py {branch}
```

### Build
```bash
./build.sh
```

### Install Locally
```bash
./install.sh --local
```