4 ms·
Note that the git conflict markers have nothing to do with Github but are generated by git itself (the commmand line client running locally on your machine).
by Animux 3y ago
Note that the git conflict markers have nothing to do with Github but are generated by git itself (the commmand line client running locally on your machine).