2 ms·merge, then resolve conflicts with rerere, undo the merge and rebaseby cerved 4y agomerge, then resolve conflicts with rerere, undo the merge and rebase