How to merge git branches quickly and correctly

ByWeiwei Jia

Suppose I have following branches

harryxiyou@common_vm ~/forest/sqle/sqle/scripts $ git branch
* dev-harry
master
rc


After I did some changes on dev-harry branch, I wanted to merge dev-harry into rc branch.

1, git checkout rc
2, git merge dev-harry

References:
http://stackoverflow.com/questions/24147169/merge-two-remote-branches-in-git
https://www.atlassian.com/git/tutorials/using-branches
http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging


I usually add --no-ff during git merge to force git to add a commit for the merge operation.

Yeah, it is more reasonable ;-)

Read more:

Similar Posts

  • How to split a string by string in Bash?

    ByEric Ma

    How to split a string by string in Bash? For example, “a string separated by space” => [“a”, “string”, “separated”, “by”, “space”] and “a,string,separated,by,comma” => [“a”, “string”, “separated”, “by”, “comma”] You can convert a string to an array using the grammar like inarr=(${a}) If the delimiter is not space and delimiter is a single character…

  • How to keep master thesis safety and availability on Windows

    ByWeiwei Jia

    When you write your master thesis (in Chinese) on windows, you may have following worries. a, Be afraid your master thesis is lost (or can not be accessed) when hard disk/udisk is broken (or something other viruses). b, Keep master thesis availability (7×24) and safety. c, Do not want anyone else to access it before…

  • Chinese Charactor Configuration on Fedora 11

    ByEric Ma

    最新的更新版本请看: 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…

  • How to Send Email Using mailx/s-nail in Linux Through Internal SMTP

    ByEric Ma

    How to Send Email from mailx Command in Linux Using Gmail’s SMTP introduces how to send email using heirloom mailx (or s-nail if you are using Ubuntu 18 or later or similar releases) command in Linux through Gmail’s SMTP which requires some configuration. On the other hand, there are many environments that do not require…

Leave a Reply

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