It depends on the operation you are trying to perform. In the example we just did, we were trying to update the local copy of our branch to match the remote copy - so we checked out our branch and did git merge origin/<branch-name>. Later we will learn other scenarios for git merge!
It depends on the operation you are trying to perform. In the example we just did, we were trying to update the local copy of our branch to match the remote copy - so we checked out our branch and did
git merge origin/<branch-name>
. Later we will learn other scenarios for git merge!