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

I recommend pulling instead. That way you do not lose information on when given code was done and conflict resolution is visible, making hacks like git-rerere less required and automated merging tools more potent.

This is really important when there are parallel feature branches and even more so when features are codependent.

E.g. if feature a depends on feature b, if you rebase feature a you cannot just pull it into feature b as there will be duplicate commits.

If you want nice lines you should hire a painter. If you want easy merges, merge instead of rebasing.



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

Search: