git remote add upstream <url>git fetch upstreamgit checkout maingit merge upstream/main解决冲突git push origin main