fix: auto-resolve sync conflicts and preserve existing .gitignore#13

robmorgan merged 1 commit intomainrobmorgan/metamorph:mainfrom

fix/sync-conflict-resolutionrobmorgan/metamorph:fix/sync-conflict-resolutionCopy head branch name to clipboard