One repo, one branch, one remote. No middle stages, no atomic-unit theatre.
git add -A
git commit -m "<what you did>"
git pushThat's it. git push lands on zo/main because main tracks zo/main.
- Remote:
zo→ https://github.com/adityasingh2400/Zo.git (the only remote) - Branch:
main(the only branch; trackszo/main) - Origin (
chicken/ ychackathon): removed. Do not re-add. zo-mainlocal branch: removed. There is nozo-main, onlymain.
- Do not add
originpointing atchicken/ychackathonagain. - Do not create a
zo-mainbranch. The branch ismain. - Do not push to anything in
/Users/aditya/Desktop/ychackathon/— that directory is dead weight from before the migration. Treat it as read-only archive; better, ignore it entirely. - Do not split work into "secret-migration-friendly" atomic commits. Migration is over. One commit per logical chunk is fine; one commit per whole feature is also fine.
- Land working commits to
maindirectly. No PRs, no feature branches. - Tag at every working state per the build plan
(
v0.1-cartesia-green,v0.2-audio-first-green, …,v0.7-FREEZE). Push tags withgit push --tagsonce they're set. - If something breaks production:
git revert <bad-sha> && git push. Don't force-push.
If the local clone gets weird, the canonical state is on github:
cd /Users/aditya/Desktop/Zo
git fetch zo
git reset --hard zo/main # only do this if local work is throwawayLocal backup tag from the migration cleanup: pre-zo-cleanup (kept locally,
not pushed). Recover via git checkout pre-zo-cleanup if needed.
git remote -v
# expected:
# zo https://github.com/adityasingh2400/Zo.git (fetch)
# zo https://github.com/adityasingh2400/Zo.git (push)
git branch -vv
# expected:
# * main <sha> [zo/main] <last commit msg>If git remote -v shows anything other than zo, run:
git remote remove origin # if origin came back somehow