DEV Community

Discussion on: What is git rebase?

Collapse
 
borrrden profile image
Jim Borden

C2 will apply the changes on top of D as if it were a regular merge. As such, you can get merge conflicts at this stage but after you merge them your history will still be cleaner.