Dealing with diverged git branches

from blog Julia Evans, | ↗ original
Hello! One of the most common problems I see folks struggling with in Git is when a local branch (like main) and a remote branch (maybe also called main) have diverged. There are two things that make this situation hard: If you’re not used to interpreting git’s error messages, it’s nontrivial to even realize that your main has diverged from the...