2 ms·Squash commit can fix the conflict.by Towaway69 9mo agoSquash commit can fix the conflict.mmh0000 9mo agoDoesn't work if there are too many diffsTowaway69 9mo agoDiffs can always be patched up.deleted 8mo ago[deleted]