- Adding a line: ✅
- Removing a line: ✅
- Modifying a line: ✅
- Moving a codeblock: ❌ i see you’ve rewritten everything, let me just highlight it all.
RIP reviewers on my PR.
(Meme created by my coworker)
RIP reviewers on my PR.
(Meme created by my coworker)
I think Sublime Merge does this with the conflict resolution tool