Skip to content

Show what happens when there merging non-diverging branches

Show what happens when there merging non-diverging branches (required for understanding the most common git pull situation). There was some confusion as to why this does not result in a merge commit.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information