سناریو / علت

Local edits conflict with incoming remote changes when executing git pull.

راه حل

# Stash local changes
git stash
# Pull from remote
git pull
# Apply stashed changes
git stash pop
# Resolve any conflicts
git add .
git commit

نکات حرفه‌ای

Always commit or stash local changes before pulling to avoid conflicts.