Thanks for the guide, I've never been clear on this! In the last diagram, does C2 overwrite the changes from D? Or does it functionally do the same thing a regular merge?
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.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Thanks for the guide, I've never been clear on this! In the last diagram, does C2 overwrite the changes from D? Or does it functionally do the same thing a regular merge?
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.