Make Git Branch Master

Posted:

Friday, June 21st, 2013

Last modified:

Thursday, April 9th, 2015

Topics:

How to make a branch into the master branch of git

git checkout our_branch
git merge --strategy=ours master
git checkout master
git merge our_branch

References

http://stackoverflow.com/a/2763118/265901

Available Wiki Topics

@TODO	chrome	Excel	ls	Photography	sysconfig
acpi	Composer	extensions	lsof	PHP	Tar
AJAX	Compser	file system	Mamp	PhpStorm	Taxonomy
Algorithms	Cookies	Firefox	math	Plesk	TCP
Android	CoreAudio	FTP	Module Development	Postgresql	Tests
angular	Coverage	Git	mod_rewrite	Programming	Theme Development
angular-1.x	cron	Gnome	MongoDB	Python	This wiki page is incomplete
Ansible	CSS	grep	Mothership Theme	Queues	Time and Date
Apache	cURL	Gunzip	MySQL	Rackspace	Tomcat
APT	Cygwin	gzip	mysqldump	Rails	Typography
Aptana	Data Structures	Hardware	Networking	React	Ubuntu
Arrays	Database	htaccess	NFS	REHL	vagrant
Backups	Debug	HTML	Nginx	RSpec	Variables
BAM	Demonstrations	HTTP	ngrok	Ruby	Views
Bash	dev tools	Ignore	Node	Sass	Views Data Export
benchmarking	Devops	images	Nodequeues	SCP	VirtualBox
Bitbucket	dig	Intellij	Not fully tested	Security	VirtualHosts
Blocks	directivess	iptables	npm	sed	wget
Bower	Drupal	Jasmine	nvm	SQL	Wiki
Caching	Drupal5	Java	OOP/D	SSH	Win7
cat	Drupal6	Javascript	OSX	SSHFS	WordPress
CDbCriteria	Drupal7	Jest	OSX Server	Strings	WWW
CentOs	drush	jQuery	Pagination	Sublime Text	XAMPP
CentOs5	Editors and IDEs	kill	Pantheon	Surviving Obsolescence	Xdebug
CentOs6	EPEL	Legacy	PDO	Syntax	Xfce
CGridView	errors	Links	Performance	sysadmin	Yii
Charsets	ES6	Linux	perl

The operator of this site makes no claims, promises, or guarantees of the accuracy, completeness, originality, uniqueness, or even general adequacy of the contents herein and expressly disclaims liability for errors and omissions in the contents of this website.