4 ms·
Not really a show HN. Also, rebase master into your feature branches regularly.
by turdnagel 8y ago
Not really a show HN.
Also, rebase master into your feature branches regularly.
- AstralStorm 8y agoI 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.