block-beta
columns 1
block:notes
a["it happens when two or more changes are made to the\n same chunk of a file and git doesn't know\nhow to apply the most recent change"]
end
block:notes2
b["conflicts are indicated by the markers >>> === <<<"]
end
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,notes,notes2,notes3,info transparent
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:1.4em;
class a,b,c,notes,notes2,notes3,info textFont