Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Ask HN: How are pull requests integrated in a repo with high commit frequency?. Parent comment
I don't think a devops solution can remove those conflicts. At least not all of them.
If you have devs in the same hot-spots of the code, you're going to get conflicts. Maybe refactoring can address some of this core issue.
There are no comments on this comment yet.
I don't think a devops solution can remove those conflicts. At least not all of them.
If you have devs in the same hot-spots of the code, you're going to get conflicts. Maybe refactoring can address some of this core issue.