I avoid this problem by not rebasing.