Gitexit code > 0
error: Your local changes would be overwritten by merge
$error: Your local changes to the following files would be overwritten by merge:
package.json
Analysis
You have uncommitted changes in files that the merge (or pull) needs to update.
Common Triggers
- ●Modifying files locally without committing before pulling updates.
Debug Checks
- $Run
git statusto see your uncommitted changes.
Resolution
1
Commit your changes:
git commit -am 'message'.2
Stash your changes:
git stash then git pull then git stash pop.3
Discard local changes:
git checkout -- <file>.Metadata
- Tool
- Git
- Severity
- High
- Tags
- #git#merge#pull