Resolve an in-progress git merge or rebase conflict SAFELY — understand BOTH sides' intent before you resolve, never blind-accept `--theirs`/`--ours`. Use when 'merge conflict', 'rebase conflict', 'CONFLICT (content)', 'fix the conflicts', 'resolve the conflicts', 'accept incoming vs current', git h
Resolve an in-progress git merge or rebase conflict SAFELY — understand BOTH sides' intent before you resolve, never blind-accept `--theirs`/`--ours`. Use when 'merge conflict', 'rebase conflict', 'CONFLICT (content)', 'fix the conflicts', 'resolve the conflicts', 'accept incoming vs current', git halts mid-merge/mid-rebase, or `<<<<<<<` markers appear in a React/Next/TS file. Mode-switches: regen
Esta entrada no publica ningún paquete de npm, así que Forge no tiene un árbol de dependencias para ella. Es una carencia de cobertura, no una afirmación de que no tenga dependencias.