如何合并两个分支（本地与远程分支）

Question

I created the branch testDB and I want to pull from the databasecheck , which a colleague's branch, into the former.

I know that I have first to fetch and then to merge but I do not know how to do it exactly.

So, given the names of the branches that I have to merge can someone show me exactly how to do it ?

Answer 1

The simplest way is git pull origin databasecheck while you have your branch checked out. This will fetch from the origin and then merge the origin/databasecheck into your local testDB branch

Answer 2

You have to switch to the branch you want to merge into (testDB in this case) then run the command git merge databasecheck

This would merge databasecheck into testDB.