Bash Question
How to merge two branches (my local with a remote branch)
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 ?
Recommended for you: Get network issues from WhatsUp Gold. Not end users.
Answer Source
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
Recommended from our users: Dynamic Network Monitoring from WhatsUp Gold from IPSwitch. Free Download