Skip to content
Better HN
Top
Best
Ask
Show
New
Jobs
Search
⌘K
0 points
jakub_h
10y ago
0 comments
Save
Share
> 88642ba Fix all the conflicts
> fbd2658 Conflict all the fixes
Sounds like some amount of made-up work!
0 comments
1 comments · 1 top-level
top
newest
oldest
rev_bird
10y ago
Merge conflicts never end when I think they will.
j
/
k
navigate · click thread line to collapse