@yogthos now the third option is definitely the right way.

@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.

csnetprogrammer

0 post score
0 comment score
joined 3 years ago