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

Whilst this is occasionally useful, it's best avoided in my opinion as it's incredibly difficult to review a merge commit (especially a large merge commit).

(Most of the time I'd advocate, if you have to do larger project branches, either merging work in piecemeal asap e.g. hidden behind a flag or whatever, or keeping work in new files so that merge conflicts are kept to a minimum.)



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

Search: