Resolve simple merge conflicts on GitHub - github.com/e-jigsaw/web2016/12/14Resolve simple merge conflicts on GitHub - github.com/e-jigsaw/webjigsawResolve simple merge conflicts on GitHubgithub
