推送时是否有一个git配置来自动解决合并冲突?

时间:2013-07-16 13:54:28

标签: git

是否有配置告诉git在推送时自动拉动和合并?

$ git push

<takes a few seconds>
<grabs a coffee>

error: failed to push some refs to 'git@github.com:foo-bar/baz.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git pull

All files merged without human intervention

$ git push

A few extra bits of attention and time were stripped away from my life.

0 个答案:

没有答案