Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on We Put Half a Million Files in One Git Repository, Here’s What We Learned. Parent comment
There is also '-merge', which will cause git to not attempt to merge the contents, but just ask you to pick a side.
The challenge however is then verifying the contents of these files in things like merge requests.
See https://gitirc.eu/gitattributes.html
There are no comments on this comment yet.
There is also '-merge', which will cause git to not attempt to merge the contents, but just ask you to pick a side.
The challenge however is then verifying the contents of these files in things like merge requests.
See https://gitirc.eu/gitattributes.html