Improve apply conflict handling with parsed file list and resolution guidance#118

that-github-user merged 1 commit into

mainthat-github-user/thinktank:mainfrom

issue-80-conflict-handlingthat-github-user/thinktank:issue-80-conflict-handlingCopy head branch name to clipboard