Git/merge
< Git
		
		
		
		Jump to navigation
		Jump to search
		Action: join two or more development histories together
"Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by git pull to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."