我正在从只有我访问权限的代码库中拉取代码。据我所知,我只从一个代码库向其推送过代码。但有几次我尝试向该代码库推送代码时出现了以下情况:
To jbaker@192.168.2.216:tsched_dev.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'jbaker@192.168.2.216:tsched_dev.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.
通常,这意味着我需要执行 git pull
(尽管所有更改都应该是快进的)。当我执行 git pull
时,会出现冲突。如果我执行 git pull --rebase
,则可以正常工作。我做错了什么?