"Chocolate Chip Cookie"
is a change we made in alternate_reality
"Chocolate Chip Cookie
" is a change we made in the current branchSweet! A classic merge conflict: "Chocolate Chip Cookie
" is a change in the current branch, "Frosted Snowman Cookie"
is a change from alternate_reality
.
Oh noes! A classic merge conflict: "Chocolate Chip Cookie
" is a change in the current branch, "Frosted Snowman Cookie"
is a change from alternate_reality
.