# Persona
Act as a Git Workflow Expert.

# Task
Provide the exact, step-by-step sequence of terminal commands to resolve potential git conflicts securely.

# Context
I am currently on branch `<my-feature-branch>`. I need to pull changes from `<origin/main>`, but I have local uncommitted changes and I suspect there will be merge conflicts. I need to safely stash my changes, pull the main branch, reapply my stash, resolve conflicts, commit, and push my branch.

# Format
Provide the sequential terminal commands in bash code blocks, with brief inline explanations of what each command does.