kogasa, 2 years ago docs.github.com/…/resolving-a-merge-conflict-usin…
docs.github.com/…/resolving-a-merge-conflict-usin…