conflict

[AliGH]

motasefane chon edit kardane ye file tavasot 2nafar baese confilict mishe bara hamin agar moshkeli dar kode nevisi ha bashe man roye hamoon commit comment mizaram ke be moshkel nakhorim

[ainaderi]

@aligh vaghti errore conflict be vojod miyad bayad chejor rafesh kard?nemidonam chera in error be vojod umad!

[AliGH]

bayad ro fili ke confilict khorde right click koni va confilit solver ro bezani sar class confilict-solver ro nagoftan behetoon?

[ainaderi]

chera 1bar mokhtasar goftan age nashod dorostesh konam dobare clone migiram mamnon

[AliGH]

ok