Git merge combines two branches together. The git merge command is powerful in that it can recognize and mark any conflicts that it finds so they can be corrected manually.