search

nus-cs2113-AY1920S2 / forum

4 stars 0 forks source link

Inquiry on Merge Conflict #27

Closed SibingWu closed 4 years ago

SibingWu commented 4 years ago

I wonder what the three markers mean?

image

damithc commented 4 years ago

There is a slightly longer explanation in the textbook, quoted below: image

It shows what each branch is trying to add to that location of the file.