> 88642ba Fix all the conflicts > fbd2658 Conflict all the fixes Sounds like som... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

jakub_h on March 31, 2016 | parent | context | favorite | on: This should never happen

> 88642ba Fix all the conflicts

> fbd2658 Conflict all the fixes

Sounds like some amount of made-up work!

rev_bird on April 1, 2016 [–]

Merge conflicts never end when I think they will.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact