3 ms·You'd have merge conflicts whether you merge or rebase.by cryptonector 9mo agoYou'd have merge conflicts whether you merge or rebase.