How would you handle diverged branches with conflicting changes?

When branches diverge, Git can’t automatically merge them — it needs your help.

Steps:

Pull the latest changes and rebase or merge:

git fetch origin

git merge origin/main

git rebase origin/main