Pull updates from remote

I need the latest changes from origin in my working repo so CI runs against current code. Pull the remote updates into my local main branch, but stop and report if there are local uncommitted changes, or if a merge would create conflicts. After pulling, show the last three commits and whether my build files changed. Do not assume any network access problems are permanent.

Before I pull updates into main, make it safe and obvious for reviewers. Summarize what changed on origin since my last pull, surface commits that touch package.json, Dockerfiles or CI workflows up top, and flag any renamed or deleted files that will affect deployment. Say which commits likely need a local test run and why.

I tried to pull origin/main into my local main and the command stopped with merge conflicts. I am the only developer on this small service and afraid I might lose my local edits or break the deploy. I cannot tell which remote change caused the conflict. Tell me the most likely diagnosis and the safest next steps to resolve the conflicts and preserve my local work.

Over several sprints I repeatedly get blocked by unexpected upstream changes when I pull, which wastes time and risks bad merges. Help me change one habit so pulls stop causing friction. Suggest a concise workflow and one concrete check I should do before pulling each day.