shaunbent’s Twitter Archive—№ 12,665

RT @github: Resolve simple merge conflicts directly from your pull requests! github.com/blog/2293-resolve-simple-merge-conflicts-on-github