git_conflict 0.1.2

A git conflict manager library
Documentation 
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
47
48
49
50
51
52
53
54
55
56
57
58
59

# git_conflict

[![Crates.io](https://img.shields.io/crates/v/git_conflict.svg)](https://crates.io/crates/git_conflict)
[![docs.rs](https://docs.rs/git_conflict/badge.svg)](https://docs.rs/git_conflict)
[![License](https://img.shields.io/crates/l/git_conflict.svg)](../../LICENSE)

Core library for git conflict detection and resolution. Provides traits and implementations for staging, committing, checking out, and resolving conflicts between branches using the `git2` crate.

---

## Features

- Detect whether conflicts exist in the current index
- Check out local or foreign branch versions of conflicted files
- Strip conflict markers and combine changes from both branches
- Stage and commit resolved files programmatically

---

## Usage

Add to your `Cargo.toml`:

```toml
[dependencies]
git_conflict = "0.1.2"
```

Initialize a `Repo` and resolve conflicts:

```rust

use git_conflict::{git_operations::Repo, GitOps, Initialize};

let mut repo = Repo::init("main".to_string(), "feature".to_string());

if repo.does_conflict_exists() {
    repo.checkout_local().resolve_conflict_by_discarding();
}
```

---

## Traits

**`Initialize`** — construct a `Repo` from the current working directory.

**`GitOps`** — conflict resolution operations:
- `does_conflict_exists` — check if the index has conflicts
- `checkout_local` / `checkout_foreign` — select which side to keep
- `resolve_conflict_by_discarding` — keep one side, discard the other
- `resolve_conflict_by_combining` — strip markers and keep both sides
- `staging` / `commit` — stage and commit resolved files

---

## License

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