3 ms·git rerere and mostly automatic rebasing. very rarely there are conflicts.by rurban 8y agogit rerere and mostly automatic rebasing. very rarely there are conflicts.