2 ms·
It's as easy as searching for ">>>>" in your text editor; the conflicts will be clearly marked and you take the markers out and make the merged code look the wa
by bitwize 13y ago
It's as easy as searching for ">>>>" in your text editor; the conflicts will be clearly marked and you take the markers out and make the merged code look the way you want it.
- skeletonjelly 13y agoOr use my favourite conflict program p4merge