Working From Two Computers

Home and office, desktop and laptop. The rule is short enough to remember:

Pull before you start. Push when you finish.

Sitting down

git pull

Downloads anything you pushed from the other machine. Or tell Claude Code: “Pull the latest changes from GitHub before we start.”

Standing up

git add -A
git commit -m "Description of work done"
git push

Or: “Save my work to GitHub.”

When you forget

Git will refuse the push and tell you there is a conflict. The usual fix:

git pull --rebase

This replays your changes on top of what is already on GitHub.

If both machines edited the same file, you get a file conflict. Claude Code can sort it out — say “I have a git merge conflict. Help me resolve it.”

Avoiding it entirely is a habit, not a technique. Pull when you sit down. Push when you stand up.

Next

Updating the Framework