jakub-g / git-resolve-conflict

:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

Date Created 2016-08-24 (8 years ago)

Commits 46 (last one 2 years ago)

Stargazers 52 (0 this week)

Watchers 3 (0 this week)

Forks 11

License mit

Ranking

RepositoryStats indexes 585,332 repositories, of these jakub-g/git-resolve-conflict is ranked #451,255 (23rd percentile) for total stargazers, and #422,835 for total watchers. Github reports the primary language for this repository as Shell, for repositories using this language it is ranked #12,058/15,367.

jakub-g/git-resolve-conflict is also tagged with popular topics, for these it's ranked: git (#1,278/1472)

Other Information

jakub-g/git-resolve-conflict has Github issues enabled, there are 4 open issues and 0 closed issues.

All Topics

git git-mergetools merge-conflicts resolve-conflicts conflict-resolution conflicting-changes

Star History

Github stargazers over time

Watcher History

Github watchers over time, collection started in '23

Recent Commit History

2 commits on the default branch (base) since jan '22

Yearly Commits

Commits to the default branch (base) per year

Issue History

Languages

The only known language in this repository is Shell

updated: 2024-10-05 @ 12:49am, id: 66462441 / R_kgDOA_Yi6Q