1. git add . 2. git commit -m "" 3. git fetch origin 4. git stash 5. git merge origin/main 6. git stash pop 7. git push origin main
1. git remote add upstream [github주소] 2. git fetch upstream 3. git merge upstream/main 4. git push origin main