问一个git的问题嘛~

[Rabbit52]

是这样得，我的项目要往服务器上部署嘛，但是服务器的配置文件是要修改的，然后修改之后下次使用 git pull 的时候提示我有未提交的修改不要我更新

可不可以像SVN那样嘛，update顶多会产生冲突

[Rabbit52]

@hpyhacking 能啊！我已经解决了，而且完美，嘿嘿
http://rabbit52.com/2012/devel/deploy-with-git

[supersheep]

@NemoAlex
试用了你的方法，按理应该正确，但是却出现了如下结果
git fetch --all

remote: Counting objects: 74, done.
remote: Compressing objects: 100% (47/47), done.
remote: Total 47 (delta 36), reused 0 (delta 0)
Unpacking objects: 100% (47/47), done.

from /home/git/fdz
af16fbe..0e2cbde master -> origin/master

git merge master
Already up-to-date.
没有出现预期中显示合并信息的情况，pull时才被merge。pull难道不是fetch+merge么？

git pull origin master

* branch master -> FETCH_HEAD
Merge made by the 'recursive' strategy.
application/config/form_validation.php | 4 ++--
application/controllers/meal.php | 2 +-
application/views/frag/footer.php | 14 +++++++-------
application/views/frag/header.php | 12 ++++++------
...

[berryphone]

兔子哥，我是来打酱油的~

[NemoAlex]

@supersheep Sorry，应该是“git merge origin master”才对，少写了个 origin
或者你可以不执行 fetch 操作，直接“git pull origin master”

[Rabbit52]

@berryphone 你叫我哥，不埋汰我嘛。疯子哥

[Rabbit52]

@supersheep 应该是git merge origin/master

[yaotian]

看我总结的文章，应该对你有帮助 https://github.com/yaotian/doc/blob/master/git.md