fix(cli): surface and safely remediate gitignore conflicts - #127

fix(cli): surface and safely remediate gitignore conflicts#127

Traderfuz wants to merge 4 commits into

kunchenguid:mainkunchenguid/gh-axi:mainfrom

Traderfuz:wt/gitignore-tracking-hygiene-cleanTraderfuz/gh-axi:wt/gitignore-tracking-hygiene-cleanCopy head branch name to clipboard