Try to continually merge in upstream changes when you're working on a long-term ... | Hacker News

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

		wahnfrieden on April 30, 2013 \| parent \| context \| favorite \| on: Stay away from rebase Try to continually merge in upstream changes when you're working on a long-term branch, to minimize the individual deltas.

gte910h on April 30, 2013 [–]

This is exactly the best practice for feature branches.

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