DEV Community

Discussion on: 🌳🚀 CS Visualized: Useful Git Commands

adarshshrivastava001 profile image

Is it true that we can't get merge conflicts while rebasing? Because I am positive I faced some merge conflicts while rebasing. It would be great if someone could explain when and why would that happen?