automergetool (pypi): A tool to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.
Keywords: git|merge|conflicts|conflict-resolution|git-mergetools|hacktoberfest|hacktoberfest2020|hacktoberfest2021|python