git-conflict-cli 0.1.2

A git conflict manager library
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

# git-conflict-cli

[![Crates.io](https://img.shields.io/crates/v/git-conflict-cli.svg)](https://crates.io/crates/git-conflict-cli)
[![License](https://img.shields.io/crates/l/git-conflict-cli.svg)](../../LICENSE)

Interactive CLI tool for resolving git conflicts. Built on top of the [`git_conflict`](../git-conflict) library.

---

## Installation

```bash
cargo install git-conflict-cli
```

---

## Usage

From inside a git repository that has a conflict:

```bash
gcm <src_branch> <dest_branch>
```

**Example:**

```bash
gcm main feature/my-feature
```

---

## Options

| Option | Description |
|--------|-------------|
| 1 | Keep local HEAD changes |
| 2 | Keep foreign branch changes |
| 3 | Remove markers and keep both changes |

---

## License

MIT — see [LICENSE](../../LICENSE)