feat: enhance conflict resolution and safety checks#1

hisco merged 1 commit into

mainskyhook-io/git-sync-commit:mainfrom

fix-prevent-conflict-markers-in-commitsskyhook-io/git-sync-commit:fix-prevent-conflict-markers-in-commitsCopy head branch name to clipboard