git checkout master
git pull
git checkout <branch>
git merge master
[ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push
2022年更新
我在上方寻求帮助,但遇到了一些git错误!
我想这是由于新的git更新导致的!
所以,我运行了以下命令:
git checkout <branch>
例如:git checkout origin/main
git pull <repository link when you forked>
git checkout <branch>
git merge <branch>
现在去文件中检查你的更改!
git add
git commit
或者
git commit -m "commit"
git push origin HEAD:<name-of-remote-branch>