Squash commit can fix the conflict. | Hacker News

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

		Towaway69 13 days ago \| parent \| context \| favorite \| on: Fix the iOS keyboard before the timer hits zero or... Squash commit can fix the conflict.

		help

mmh0000 13 days ago [–]

Doesn't work if there are too many diffs

Towaway69 13 days ago | [–]

Diffs can always be patched up.

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