wr
hn
Top
New
Best
Ask
Show
Jobs
Back
G
github.com
Resolve simple merge conflicts on GitHub
228 points
moby
10 years ago
67 comments
Discussion
