Fix Diverged Git Branches

Diagnose and resolve situations where local and remote branches have diverged, have conflicts, or are otherwise out of sync.

Instructions

1. Diagnose the current state

Run these commands to understand the situation:

git status
git log --oneline -10
git log --oneline origin/<branch> -5