我使用的是Git 1.7.4.1。我想将我在一个文件夹上做的提交推送到远程仓库。如何只将更改从一个文件夹推送到远程回购?所有的文档,我只找到列出如何推动整个回购...只推送一个文件夹到远程回购
davea-mbp2:systems davea$ git push origin trunk
Password:
To http://[email protected]/systems.git
! [rejected] trunk -> trunk (non-fast-forward)
error: failed to push some refs to 'http://[email protected]/systems.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
我被警告不要套用到我要推的文件夹中的冲突。任何帮助表示赞赏, - 戴夫