You could wait a bit after forking. | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		dotancohen 74 days ago \| parent \| context \| favorite \| on: Fix the iOS keyboard before the timer hits zero or... You could wait a bit after forking.

Towaway69 74 days ago [–]

Squash commit can fix the conflict.

mmh0000 74 days ago | [–]

Doesn't work if there are too many diffs

Towaway69 74 days ago | | [–]

Diffs can always be patched up.

Consider applying for YC's Summer 2026 batch! Applications are open till May 4
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact