git-conflict-cli 0.1.2

A git conflict manager library

git-conflict-cli-0.1.2 is not a library.

git-conflict-cli

Interactive CLI tool for resolving git conflicts. Built on top of the git_conflict library.

cargo install git-conflict-cli

From inside a git repository that has a conflict:

gcm <src_branch> <dest_branch>

Example:

gcm main feature/my-feature

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

MIT — see LICENSE