@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.
csnetprogrammer
joined 2 years ago
@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.
@yogthos now the third option is definitely the right way.