Sync a branch with latest changes

This skill is for Code Review & Testing and helps you rebase a feature branch onto main, resolve merge conflicts methodically, and clean up commit history.