git diff --check

From wikieduonline
Jump to navigation Jump to search


/path/locals.tf:2: leftover conflict marker
/path/locals.tf:14: leftover conflict marker
/path/locals.tf:28: leftover conflict marker
CONFLICT

git diff: [main | HEAD | --staged | --name-only | --stat | --cached], --help

Advertising: