Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on We've raised $17M to build what comes after Git. Parent comment
You can define your own merge strategy that uses a custom executable to fix conflicts.
https://stackoverflow.com/a/24965574/735926
There are no comments on this comment yet.
You can define your own merge strategy that uses a custom executable to fix conflicts.
https://stackoverflow.com/a/24965574/735926