git-resolve-conflict
Version:
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
| Filename | Content Type | Size | |
|---|---|---|---|
| 2.08 kB | |||
| 1.39 kB | |||
| 9 B | |||
| 63 B | |||
| 1.08 kB | |||
| 5.95 kB | |||
| 4.02 kB | |||
| 728 B |
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
| Filename | Content Type | Size | |
|---|---|---|---|
| 2.08 kB | |||
| 1.39 kB | |||
| 9 B | |||
| 63 B | |||
| 1.08 kB | |||
| 5.95 kB | |||
| 4.02 kB | |||
| 728 B |