News for hackers. Stuff that matters.
Re:Notion – All-in-one workspace for notes, tasks, wikis, an... by indigodaddy on Monday January 14, 2019 @10:16PM (#18908616)
I prefer FileMerge. Built in to osx/xcode I believe.
Re:Notion – All-in-one workspace for notes, tasks, wikis, an... by MordodeMaru on Tuesday January 15, 2019 @02:15AM (#18909353)
Give Semantic Merge a try https://www.semanticmerge.com