Pull latest changes

I need the branch up to date before I run the new feature locally. Pull origin/main into my current branch and stop if there are conflicts; tell me which files changed and whether any migrations or dependency updates were pulled in.

Before I pull the main branch into feature/julie-search, make this safe and easy: show a short summary of incoming commits with author and message, highlight commits that touch database migrations, lockfile, CI scripts, or public APIs, and warn if tests or linters have recently failed on those commits.

I just pulled latest and two new DB migrations landed from Marco. I haven’t run them locally and I’m worried about data shape and test flakiness. I can’t ask Marco right now. What’s the most likely risk and the best immediate steps to validate the migrations locally without affecting prod or my branch state?

Every time I pull origin/main into feature branches I get surprise changes that break my local runs or tests. Where am I losing time and what one habit or repo practice should I change so pulls are predictable and don’t repeatedly derail my work?