git-github-conflict-resolve - Git Merge Conflict Resolutiongitmergeconflictresolution★ 0 · Updated 2026-03-22Identify and resolve Git merge conflicts with multiple resolution strategies⚙ detect conflict markers⚙ list conflicted files⚙ view conflict details