This is why I prefer git merge to git rebase — I delete code left and right, and occasionally I need to restore a method or two I thought I won't need anymore,

This is why I prefer git merge to git rebase — I delete code left and right, and occasionally I need to restore a method or two I thought I won't need anymore, but I was wrong. Much easier if you keep your git history sacred and don't rewrite it.