Git & GitHub
git pull --rebase then git push<<<<<<< / ======= / >>>>>>> blocks by hand, keep the correct code, then git add . and git commitgh auth login — follow the promptscd into the project first, or git init if it's brand newgit rm --cached <file>, add it to .gitignore, then commit again