fatal: Not possible to fast-forward, aborting. Why? 提交有冲突 Solution 解决冲突 git pull origin main --rebase git status # resolve all conflits manually; git add <conflicted_files> git rebase --continue