Git Pull Conflicts

Use This Guide When

Before You Run Anything

• Run `git status`, `git branch --show-current`, and `git remote -v` inside the intended repository.
• Back up uncommitted files before rebasing, amending, resetting, or rewriting history.
• Remove tokens, private keys, and personal paths from any output you share.

Diagnostic Or Setup Commands

After the pull, `git stash pop` can create another conflict set. Resolve named files, stage them, and continue only when `git status` is clear.

cd ~/DedSec
git status
git stash push -u -m "backup before pull"
git pull --rebase
git stash pop
git status

What The Commands Tell You

• `git status` — Shows the branch, staged files, conflicts, and local changes.
• `git stash push -u -m "backup before pull"` — Temporarily stores local changes.
• `git pull --rebase` — Downloads and integrates remote commits.

What Success Looks Like

• `git status` shows the expected branch and no unresolved conflicts.
• The configured remote points to the intended repository and authentication succeeds without exposing credentials.
• The pushed commit contains only the files you expected.

Safe Next Steps

1. Confirm the repository, branch, remote, and working-tree state.
2. Use the least destructive action that addresses the exact Git message.
3. Review the diff and staged files before committing or pushing.
4. Verify the result on GitHub after the push completes.

Common Mistakes

• Running Git commands one folder above or below the intended repository.
• Using force push, reset, or history rewriting before creating a verified backup.
• Putting access tokens directly into commands, screenshots, README files, or public logs.