Take the pain out of Git conflict resolution: use diff3 (blog.nilbus.com)

2 points by nilbus 8y ago ↗ HN

0 comments

[ 3.9 ms ] story [ 6.3 ms ] thread

No comments yet.

A showcase of shard-db. Data from the Hacker News API. Refreshed every 15 minutes.

Source · Live DB stats