How to pull your git tree after creating it on remote server

Currently, I have created my branch dev-harry but I cannot pull it successfully as follows.

harryxiyou@common_vm ~/forest/kvplus/kvplus $ git branch
* dev-harry
  master
  rc
harryxiyou@common_vm ~/forest/kvplus/kvplus $ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.dev-harry.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

[branch "dev-harry"]
remote = <nickname>
merge = <remote-ref>

[remote "<nickname>]
url = <url>
fetch = <refspec>

See git-config(1) for details.

However, when I checkout to rc branch, it works well. I am looking for the reasons.

harryxiyou@common_vm ~/forest/kvplus/kvplus $ git checkout rc
Switched to branch 'rc'
Your branch is behind 'origin/rc' by 3 commits, and can be fast-forwarded.
harryxiyou@common_vm ~/forest/kvplus/kvplus $ git pull
Updating 4ada91a..732d9b7
Fast-forward
 src/kv.c0 |   60 ++++++++++++++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 36 deletions(-)

Usually, adding these lines to .git/conf is fine:

[branch "dev-harryxiyou"]
    remote = origin
    merge = refs/heads/dev-harryxiyou

Similar Posts

  • | |

    SPF, DKIM and DMARC to Stop Email Sender Fraud: Intro and How to

    Email sender fraud is an annoying problem. Malicious email senders send spam emails with email senders that are under non-authorized domain names. This may affect the reputation of the domains used by the fraud sender. On another hand, lots emails will be rejected and reverted back, which causes lots additional work to the domain administrators….

  • | |

    How to list and start VirtualBox VMs in command line in Linux?

    VirtualBox is a nice open source virtual machine software. It works nicely on Linux and is supported by many Linux distros like Ubuntu in their official package repositories, so it is quite easy to set it up on Linux. The VMs can also be managed in command line using the vboxmanage command line tool provided…

  • C++ Reference and Styles

    C++ References Reference of the C++ Language Library, with detailed descriptions of its elements and examples on how to use its functions: http://www.cplusplus.com/reference/ C++ reference: http://www.cppreference.com/w/ C++ Styles I compile a list of C++ styles on the Internet. http://geosoft.no/development/cppstyle.html http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml http://www.mactech.com/articles/develop/issue_02/C%2B%2B_Style_Guide_v007.html http://www.cs.uga.edu/~dkl/1302/Fall99/style.html Read more: GNU C Reference Manual Reference: Special HTML Characters How to generate…

  • Chinese Charactor Configuration on Fedora 11

    最新的更新版本请看: Fedora 中文字体设置. 使用Linux时我个人倾向使用英文环境系统,而Fedora11在英文环境下中文字体有时会不太好看,经常遇到需要字体优化美化的问题。 以下是我的配置方案,经测试效果还算不错,解决了Fedora 11 中文字体难看的问题: 方案1:使用uming和ukai字体,即AR PL UMing CN等。 关键是使用的字体包如下: 首先要安装这两个字体: cjkuni-ukai-fonts cjkuni-uming-fonts 然后配置一下~/.fonts.conf文件. 使sans-serif serif monospace字体中文使用uming/ukai即可. 我的.fonts.conf文件可以从这里下载(两种选择, 我喜欢前者): https://github.com/zma/config_files 使用Liberation和uming/ukai字体: .fonts.cofn.liberation 使用dejavu和uming/ukai字体: .fonts.conf.dejavu 下载后放到自己的$HOME下改名为.fonts.conf就可以了。 使用uming字体效果如下(请放大后看效果): 方案2:安装文泉驿字体,这个非常简单,安装相应包即可了。 如果喜欢其它的字体选择性的安装上就可以了,只要注意只安装自己需要的就行了。有人使用微软雅黑字体,首先这是侵权的,其次开源的字体做得其实已经很不错了。 最后将字体平滑选项打开, KDE和gnome都有相关设置方法。 以上内容只是针对使用xft字体系统的设置。对于使用核心字体系统的X程序来说字体依然会出现很丑的情况。 下面是针对emacs的设置方法: 首先需要安装这个字体包: xorg-x11-fonts-misc 注意到在中文系统下emacs的中文显示非常好,而在英文环境中去非常差,我们可以利用这一点,在运行emacs前首先将系统环境设为中文即可。 在~/bin/下建立一文件ema 内容如下: #!/bin/bash rm -f ~/.emacs ln -s ~/.emacs.x ~/.emacs LANG=zh_CN.UTF-8 emacs –fullheight -r $* 然后加入执行权限即可: chmod +x…

  • lftp Disable SSL

    lftp some times stalls with message “Making data connection” when “ls” the directory after logged in the ftp site. The message may appear like this: < — 227 Entering Passive Mode (xx,xx,xx,xx,xx,xx) —- Connecting data socket to (yy,yy,yy,yy) port zz `ls’ at 0 [Making data connection…] But some client such as filezilla may works on…

Leave a Reply

Your email address will not be published. Required fields are marked *