Git Operations Advanced git workflows and conflict resolution. Decision Trees Conflict Resolution Strategy | Situation | Strategy | | ------------------------------------------------ | ------------------------------------------------------------------ | | Lock file conflict (pnpm-lock, Cargo.lock, etc.) | Never merge manually. Checkout theirs, regenerate. | | SOPS encrypted file | Checkout theirs, run , re-add. | | Simple content conflict | Resolve manually, prefer smallest diff. | | Large structural conflict | Consider / + manual reapply of the smaller side. | Rebase vs Merge | Situation | U…