4 ms·Ask HN: do you git merge or git rebase?1 points by ddalex 13y agoI realize that the kernel folks use git merge but it seems saner, to me, to use git rebase to bring upstream changes on local trees. What do you prefer, and why ?